How to handle merge conflicts with Subversion on Mac?
- by Simo Salminen
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.