You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
Hi
I'am new to SourceTree/Git. Can anyone explain what exactly "Commit merged changes immediately" while pulling does? What is the difference between checking and unchecking this option?
Cheers Philip
Hi Philip,
You have to do a commit when a merge is completed, because some of your local files might also be updated. By enabling the Commit merged changes immediately you give sourcetree the permission to do this commit directly/automatically if there were no merge conflicts.
Hope this answers your question?!
If this option was enabled and the merge fails with merge conflicts, no automatic commit will take place (and you have to do it manually after the merge conflicts have been fixed).
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
What is the difference with `git fetch` if I leave the checkbox unchecked.
git pull equal to git fetch and then merge, right ?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
"git fetch" only updates the background copies of the remote branches. None of your local branches are updated.
If you pull or merge from a tracked remote branch WITHOUT committing immediately, then it will place the merge result into your working copy as "uncommitted changes".
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
> because some of your local files might also be updated
I feel like I'm missing something here, isn't that the whole point of a pull, to update your local files? And why can't you update your local files by making a new commit?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You are right in saying the purpose of Pull is to update local files. However, checking the "Commit merged changes immediately" helps you to avoid a few clicks/commands by doing both Pull and Commit at one go.
The response might be too late for you, but still wanted to comment as it might help somebody else!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.