What merge automation tools are available?

Jun 7, 2011 at 8:00 PM

This is a discussion thread to address broader version of previous post.

Anyone used MergeMagician enough to have pros/cons/recommendation? (www.mergemagician.com)

Any other autmated merge tools or scripts available (Open source, third party, hand-crafted PowerShell scripts, etc.)?

I don't have an immediate need, but I'm interested and I'm sure there are teams that could really use additional merge/branching automation. I also remember that conflict resolution should never be considered a fully automatable process. Without humans you will get bad conflict resolutions from time to time.