You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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.