2 ms·

I found P4 Merge to be totally inscrutable, could you elaborate on what makes it so good?

• acemarke 7y ago
  I suggest using SourceGear DiffMerge for resolving conflicts. Best 3-way merge conflict handling tool I've tried: https://sourcegear.com/diffmerge/ https://sourcegear.com/diffmerge/
  • tenken 7y ago
    Better than Meld?
  • luladjiev 7y ago
    Another suggestion is Beyond Compare, the 3 way merge is a pro feature though: https://www.scootersoftware.com/ https://www.scootersoftware.com/
• jakobegger 7y ago
  It's a 3 way merge tool that works well with Fork. To be honest I can't say how it compares with other merge tools, I tried a few merge tools some time back and liked P4 best.