SVNBreeze
Connect to Server
Import Working Copy
Check-out New Working Copy
Update
Resolve Conflicts
View Changes
Check-in Changes
Branch
Merge
Options

SVN
Terms

Resolve Conflicts

Conflicts can occur when you update your local working copy from the server repository and one of the updates also has modifications in the local file. Therefore, you need to inform SVN how to deal with the conflict. After you have selected one of the options you cannot undo it, so choose wisely! Your choices are:

Conflict	Description
Overwrite Local	This choice will overwrite your local modified file with the updated server file
Ignore Server	This choice will ignore all changes from the server file
Manual	Manually see and merge the changes yourself

After an Update

At the end of an 'update', if there are any conflicts then you will be presented with a list of files that require your attention in order to resolve. From this dialog, check any desired files and select an option at the bottom (as above). The selected option will then cycle through the selected files an apply that option.

For manual merging, you will be presented with a merge window which you should manually merge the changes. After completing the merge and closing the merge window you will be prompted to confirm that merging has completed for the selected file. If you select 'Yes' then this file will have the 'conflicted' file state removed, and it will be removed from the list. If you select 'No' then the file will remain in the 'conflicted' file state and remain in the list.

From the File List

If you cancelled out of the dialog above (the resolution dialog) then you will have some files which are still in the 'conflicted' state. Whilst you have any files in the 'conflicted' state you will not be able to compile that source file (if it is a source file) as it will contain various merge/conflict information. So you must resolve it. At this stage you can manually navigate around your local working copy and right click any 'conflicted' files and go down to the 'Resolve' menu item in the context menu. From here you will have the same above three choices.