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

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

File with conflict always added to the index after external merge tool has run

I have setup sourcetree on my Windows with meld as the external 3-way merge tool. I have selected:

Merge command: C:\Program Files (x86)\Meld\Meld.exe​

Arguments: $LOCAL $BASE $REMOTE --auto-merge --output=$MERGED

Now, if I have a merge conflict in a file and I:

  • Right click the file
  • Select to resolve it using an external merge tool

Then meld gets started - good so far. Now suppose I;

  • Exit meld without changing anything and without saving the file

Then the file seems to be staged automatically even though the merge conflict is still present.

Is there a way to avoid this from happening? For example to never have the file automatically staged? Or at least only staged if it is changed? And maybe even get a warning if I attempt to stage a file with a merge conflict present?

I used to use git on the command line and I have only just setup sourcetree and meld, so I am also open to different workflows that may work better.

0 answers

Suggest an answer

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

5,800 views 4 12
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