Resolving conflicts

Let us consider a single source file that has been worked on by multiple programmers. You might have some local changes. When you try to update, it may happen that the SVN client is smart enough to merge the files together. However, in most cases it will not be able to merge properly and we need to resolve conflicts effectively. The SVN client, however, will show the files that are in conflict.

Getting ready

For this recipe, you will need a Windows machine and an installed version of an SVN client. A versioned project is also necessary.

How to do it...

In this recipe, we will find out how easy it is to resolve conflicts:

1. Take a project that is already versioned and committed to SVN.

2. Open a file in an editor and make changes to the file.

3. Perform the SVN Update operation.

4. The files now show a conflict.

5. See the differences between the two files using the Diff tool or Win Merge (you may need to install Win Merge separately).

6. Generally, the left-hand side will be the local revision...