Merge conflicting files in svn

by Kuiyu Chang — last modified Aug 25, 2008 04:42 PM

If conflict detected after "svn update"
- affected file e.g. affectedfile, will have conflict markers >>>>>>> inserted inline
- 3 special files, in addition to affectedfile will be created
  1. affectedfile.mine
    - Your local working copy before svn update
  2. affectedfile.r{oldrevision}
    - Base version before you modified your local working copy
  3. affectedfile.r{latestrevision}
    - Latest version received from SVN repository
To resolve conflict, do one of the following:
1. Edit affectedfile manually, noting the conflict markers >>>>>>>>>> and referencing the 3 special files, or
2. If you local copy is simply out-of-date, copy one of the 3 special files over to affectedfile, and/or delete out-of-date ones amongst the 3.
Tell svn that you have resolved the conflict:
```
  svn resolved affectedfile
```
Commit your changes:
```
  svn commit
```

« March 2010 »