Solving Conflicts with SmartSVN
Conflicts can be tricky for Apache Subversion users, but SmartSVN comes with a dedicated ‘Conflict Solver’ that takes the pain out of resolving them. SmartSVN’s built-in Conflict Solver combines the freedom of a general, three-way-merge with the ability to detect and resolve any conflicts that occur during the development lifecycle.
To access this conflict solver, open the ‘Query’ menu and select ‘Conflict solver.’
The contents of the two conflicted files are displayed on the right and left text areas, and the differences between the left and right content is highlighted by coloured regions within the text views.
Once you have finished editing your files, open the ‘Modify’ menu and select ‘Mark Resolved’ to mark the conflicting file(s) as resolved. In this dialog, you can also opt to:
- Leave as is – apply no further modifications to the resolved file.
- Take old – accept the version in the working copy, as it was before the update or merge was performed.
- Take new – the pristine copy after the update or merge was performed.
- Take working copy – the pristine copy before the update or merge was performed.
If you’re working with conflicted directories, you have the option to ‘Resolve files and subdirectories recursively.’ If selected, all conflicting files and directories within the selected directory will be resolved.
Note, you must resolve all the conflicts before you can commit the file(s)/directories.
Not yet started with SmartSVN? Claim your free 30 day trial at www.smartsvn.com/download