How to handle merge conflicts with Subversion on Mac?
Posted
by Simo Salminen
on Super User
See other posts from Super User
or by Simo Salminen
Published on 2009-12-07T20:50:57Z
Indexed on
2010/04/14
10:43 UTC
Read the original article
Hit count: 259
We are developing a Xcode project, using subversion version control.
I have yet to find a good tool to handle merge conflicts. Any tool recommendations? What you are using?
At the moment I am using Kdiff3, but it is a lot of work to handle lots of conflicts. Ideally I'd like to have graphical interactive tool.
Update: I found SmartSVN product, and I think it is the best.
© Super User or respective owner