← Back to context

Comment by acemarke

6 years ago

I suggest using SourceGear DiffMerge for resolving conflicts. Best 3-way merge conflict handling tool I've tried:

https://sourcegear.com/diffmerge/

2 comments

acemarke

Reply

luladjiev 6 years ago

Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:

https://www.scootersoftware.com/

tenken 6 years ago

Better than Meld?