Sourcetree merge without commit broken in v1.6.0?

I'm using Sourcetree Version 1.6.0 (just updated) on my Mac and often merge changes to master using this settings: http://o7.no/YvUXaL

Before update all was ok, but now sourcetree automatically commit changes (the first option is not selected).

How to prevent this behavior?

2 answers

Hi Marcin,

SourceTree remembers what you had previously set in this dialog now. If you check that setting now and click cancel and then re-open that dialog the preference will be automatically turned on. It's just because the last time you used that dialog the checkbox was turned off.

Hope that helps

Ok, I understand that, but why if the checkbox "Commit changes immediately (if no conflicts)" is not checked sourcetree commit changes into my working copy?

I want merge but no commit.

I just ran through a case of this in 1.6.0.1 and couldn't reproduce it, my 'Commit changes immediately' option was unchecked and right afterwards I had an uncommitted merge state to review & commit.

Are you sure your merge wasn't just a fast-forward merge, ie no changes on the destination branch? If you're in that case you also have to check 'Create a commit even if merge resolved via fast-forward'.

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Friday in Off-topic

Friday Fun: Dry T-Shirt Competition - What's your BEST (Atlassian) T-Shirt!?

[Note: So it was my turn for Friday Fun and sadly I was sick thanks to rubbish sinus infection... so apologies to most of Europe and Asia for the delayed post. However, I finally got out of bed for t...

141 views 8 3
Join discussion

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