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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


When merging with FileMerge and resolving conflicts, Sourcetree leaves Conflict Markers in the file

I'm using Sourcetree v4.1.2 and I'm seeing this behavior when merging files. If I run from Terminal the `git mergetool path-to-file` command, FileMerge launches fine, I resolve conflicts and conflict markers are removed when I quit FileMerge and execution returns to Terminal.

At the beginning of this issue I thought it was Filemerge (like apple fruit, time passes and gets rotten, v 2.11 crashes when I edit a merged change), but then it occurred to me to launch mergetool from terminal and conflict markers are no longer left in the file after FileMerge quits, so clearly this is not a FileMerge issue or it's something related to how SourceTree passes ancestors and conflicted files to FileMerge.

I haven't tried merging 2 conflicted files without SourceTree but from Terminal as I described it above.

0 answers

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events