How to handle merge conflicts with Subversion on Mac?

How to handle merge conflicts with Subversion on Mac? We are developing a Xcode project, using subversion version control.
Asked by: Guest \| Views: 258

Total answers/comments: 1

Comments display order:

bert [Entry]

I'm in love with Cornerstone. I find it the simple and intuitive UI, along with simplistic keyboard shortcuts saves lots of time compared to the command line or other programs.