Skip to content

Encountering conflicts in Subversion on Visual Studio

December 5, 2012

If you have removed a folder containing files in the past using Subversion, of which you would like to re-add them again, but on another 2nd computer using Subversion and Visual Studio. You may notice that Subversion may say “that is an existing item in conflict please mark the conflict as resolved” as an error message in Visual Studio. This is something to fret about as there is no obvious way to resolve this, if you add the files manually again from the 2nd computer onto this computer.

The best way is to go back to your second computer, add the new and/or modified files and commit there. Yes lots of effort  of file copying around, but there is no command in the GUI for you to resolve the conflicts. You then have to Update Project to the Latest Version on the 2nd computer to pick up any changes on the 1st computer!!

Advertisements

From → Uncategorized

Leave a Comment

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: