Jump to content
  • Advertisement
Sign in to follow this  
IndyOfComo

Merge tools

This topic is 2130 days old which is more than the 365 day threshold we allow for new replies. Please post a new topic.

If you intended to correct an error in the post then please contact us.

Recommended Posts

What would folks suggest for a merge tool?

 

Our project is in C#(XNA). We're using Mercurial and interfacing with it via TortoiseHG. Occasionally I have a lot of work to do helping the merge tool make decisions, and even then sometimes I get it wrong. I know I have two tools at my disposal, though so far I have only used Kdiff3 (just trying to reduce time spent learning different interfaces).  Sometimes kdiff3 can't tell that my partner and I added things to the same spot and that we need both. (I haven't been able to find a "keep both" command during the merge process.)

 

Or maybe I'm just Doing It Wrong. But I'd like to hear thoughts on merge tools.

Share this post


Link to post
Share on other sites
Advertisement

I find git with TortoiseGit( I'd assume TortoiseHG operates the same ) to be one of the easiest to use. I don't even utilize the interface and simply right click directories for all my merging needs. Really haven't had much trouble with conflicts either.

Share this post


Link to post
Share on other sites
While many systems come with merge tools of varying quality, my favorite is Araxis Merge.

It is a paid product but very much worth the money.

Also the diff of images and office documents are very nice, especially when working with game art.

Share this post


Link to post
Share on other sites

I agree with frob, Araxis is by the far the best. And also the most expensive. sad.png

 

For a cheaper option, I would go with BeyondCompare.

Share this post


Link to post
Share on other sites

In kdiff3 you have 3 buttons: A, B, C. A is the original and B and C is the two changed version. When you steps on the conflict with the arrow buttons, just press both B and C buttons. It will put both changed codes there. You can even press A, and all the three codes will be inserted. The order of the inserted texts is based on the order you pressed the buttons. But you can even edit the result in the lower merge window.

 

Share this post


Link to post
Share on other sites
I'm pretty sure the perforce merge tool is free to download on its own - P4merge. I have never had any problems with this and for c# files should be more than adequate. That's what I would go for if you want a free solution.

Share this post


Link to post
Share on other sites

I'm pretty sure the perforce merge tool is free to download on its own - P4merge. I have never had any problems with this and for c# files should be more than adequate. That's what I would go for if you want a free solution.

Another vote for P4Merge from me. Though I've only ever used one other merge tool, this has the advantage of being free (within requirements). :)

 

You can view the original file(base), and branched versions(yours and your partners changes) for resolving conflicts - and specify which change should be used(or both), and also, if necessary, modify the result by hand in the merge window below.

 

(It also works for images too, and can highlight the differences.)

Share this post


Link to post
Share on other sites

WinMerge is free, can be configured to work with Tortoise as default diff/merge tool. I've been using it for more than 5 years now, it never let me down. It also has folder compare like other paid software do.

Share this post


Link to post
Share on other sites
Sign in to follow this  

  • Advertisement
×

Important Information

By using GameDev.net, you agree to our community Guidelines, Terms of Use, and Privacy Policy.

GameDev.net is your game development community. Create an account for your GameDev Portfolio and participate in the largest developer community in the games industry.

Sign me up!