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

Christian Worm Mortensen October 2, 2020

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
TAGS
AUG Leaders

Atlassian Community Events