Extension based merge tool

Hi There,

Is it possible to have a specific file extension handled by a different merge tool? e.g. *.txt opens in default, *.mycustomfile opens in another application?

 

Thanks in advanace

2 answers

This widget could not be displayed.

This is not easily possible with SourceTree, since you can only have one merge tool.

Workaround: write a script that takes three arguments, tests for the file extension and then opens the right merge program and passes the arguments. If you then specify this as a merge tool in SourceTree, it should work as you want it.

 

This widget could not be displayed.

Balazs,

can you please throw some more light on your suggestion. We use sourcetree as the frontend to our git setup. And, we are using kdiff3 as default merge tool. 

We want to use a third party merge tool for the .xml files only. I am not able to figure out how to configure sourcetree about it. But it looks you are right that sourcetree does not provide any such feature. Can you please guide more about that script think you have mentioned about.

 

Best Regards

Sandeep Anand

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

862 views 2 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