Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

6 votes
Answer accepted

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?

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!

Like # people like this

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Training & Certification

Atlassian Cloud 101: Start quickly with free training

Free training for Jira, Confluence, and Jira Service Management Start faster and be more productive with Atlassian cloud products. Take the guess work out of where to begin, and gain confidence wi...

80 views 3 9
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you