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:
Then meld gets started - good so far. Now suppose I;
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.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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