← Back to context Comment by csmiller 5 years ago I found P4 Merge to be totally inscrutable, could you elaborate on what makes it so good? 4 comments csmiller Reply jakobegger 5 years 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. acemarke 5 years ago I suggest using SourceGear DiffMerge for resolving conflicts. Best 3-way merge conflict handling tool I've tried:https://sourcegear.com/diffmerge/ luladjiev 5 years ago Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:https://www.scootersoftware.com/ tenken 5 years ago Better than Meld?
jakobegger 5 years 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.
acemarke 5 years ago I suggest using SourceGear DiffMerge for resolving conflicts. Best 3-way merge conflict handling tool I've tried:https://sourcegear.com/diffmerge/ luladjiev 5 years ago Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:https://www.scootersoftware.com/ tenken 5 years ago Better than Meld?
luladjiev 5 years ago Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:https://www.scootersoftware.com/
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.
I suggest using SourceGear DiffMerge for resolving conflicts. Best 3-way merge conflict handling tool I've tried:
https://sourcegear.com/diffmerge/
Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:
https://www.scootersoftware.com/
Better than Meld?