Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,298,216
Community Members
 
Community Events
165
Community Groups

How to set default config for merge action to not commit merge result automatically?

Hi Everyone,

 

We are using Sourcetree for GIT. Our merge strategy relies on transferring only a subset of the different files from one branch to another, because we have such branches that not all changes made in one branch are relevant for the other. And this needs to be on a file by file level, not on a commit level.

This can be easily done if the autocommit on merge is not active, as then we just stage the files that we need and ignore the rest. Which is supported by the Merge icon from the task, but not by the merge command from the right mouse button menu. The first method (merge icon) offers a pop up where the option "Commit merge immediately (if no conflicts)" can be disabled which does exactly what we need. 

But this option always resets to enabled, so have to be set every time we merge, which means mistakes are more than likely. And I couldn't find a way to change the default behaviour of merge action from the right mouse menu at all. There seems to be no option for that in Sourcetree's Tools > Options and changing the user.config file seems to have no effect either:

I found "GitCommitMergedChangesImmediately" in  

C:\Users\<myuser>\AppData\Local\Atlassian\SourceTree.exe_Url_********\3.4.5.0\user.config

which seems to be the very thing I need, but changing that from True to False has no effect. (Even though changing other attributes in the same file have the expected effect on Sourcetree)

I would be grateful for any ideas. Many thanks.

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

61,890 views 127 27
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