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: 264

Filed under:

svn

|

mac

|

xcode

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

Related posts about svn

`svn checkout` on the SVN server causes the repo to break with a 301 error

as seen on Server Fault - Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy: server { server_name svn.ourdomain.tld; location / { proxy_pass http://localhost:8080; } } Apache is set-up as follows: <Location /> DAV svn SVNParentPath… >>> More
Can't create directory named "mysql" in subversion repository

as seen on Server Fault - Search for 'Server Fault'
I have a particular problem with subversion. Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn. I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository. There are many references to "subversion PROPSET 403… >>> More
Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

as seen on Server Fault - Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile… >>> More
Multi Svn Repositories in Apache

as seen on Server Fault - Search for 'Server Fault'
I have a set up with apache and subversion In the apache configuration i have <Location /svn> DAV svn SVNParentPath c:/svn </Location> Now i have multiple repositories a a_b a_c a_b_c a_b_d b and i want to map them as a/svn a/b/svn a/c/svn a/b/c/svn a/b/d/svn b/svn to do… >>> More
SVN Error 403 Forbidden

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I… >>> More

Related posts about mac

Need a non-Mac keyboard alternative for Mac users

as seen on Super User - Search for 'Super User'
I'm a Macbook Pro user. I like Apple products in general, but I hate their keyboards. I work on my computer/laptop 10+ hours a day, so I would like to have a keyboard that is Mac-compatible and ergonomic. I found this one on Amazon. It is specifically made for Mac. However, I would like to get some… >>> More
Including an embedded framework using a cross-project-reference: Header no such file or directory

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm trying to create a Cocoa framework by using a cross-project reference in Xcode. I have 2 projects: one for the framework; one for the application that will use the framework. This framework is not intended to be stored within the system; it is an embedded framework that lives within the application… >>> More
C# development with Mono and MonoDevelop

as seen on Developer IT - Search for 'Developer IT'
In the past two years, I have been developing .NET from my MacBook by running Windows XP into VM Ware and more recently into Virtual Box from OS X. This way, I could install Visual Studio and be able to work seamlessly. But, this way of working has a major down side: it kills the battery of my laptop…… >>> More
12.04lts: no network internet

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
Friends-- Cannot connect reliably to ethernet nor at all to Internet: Symptoms: About 2 weeks ago did an upgrade. Have not been able to connect to ethernet nor Internet. Today, for example, boot up this System76 laptop and there was no network connection. Did sudo mount -a and got some internal… >>> More
Why i disconnect every few seconds? using USB wireless adapter

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
i know it's for ubuntu questions..but mint and ubuntu are very similiar and i had the same problem with linux ubuntu too..so i think this is the right place for my question anyway i don't have experience with drivers and other things,after installing Linux on my machine( i did dist-upgrade btw) everything… >>> More