What exactly "Commit merged changes immediately" does?

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

1 answer

1 accepted

This widget could not be displayed.

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).

What is the difference with `git fetch` if I leave the checkbox unchecked.

git pull equal to git fetch and then merge, right ?

"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".

Got it. Thanks a lot.

> 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?

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Monday in Teamwork

The tools we make for teams? We use them every day at Atlassian to get shit done (and it works).

I’m Jess, a Product Marketer for Jira Software Server and Data Center, and now a huge fan of our products. Read on for a 90 day, new-hire perspective on what it’s like to standardize on the Atlassian...

43 views 0 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you