How to Resolve Conflicts in Apache Subversion

Step-by-Step Guide

1. 1

   Step 1: Once you have finished making changes to your working copy

   Select ‘SVN Commit.’
2. 2

   Step 2: it is time to commit your changes back to the repository!

   ,,, You will see three new versions of the conflicted file: the file with the highest numbered extension is the repository’s most recent file; the file with the lower revision number is your local file; and ‘filename.mine’ is the file as it existed in your working copy, before you performed an update. ,,,,
3. 3

   Step 3: Usually

4. 4

   Step 4: this is all that’s needed to commit your changes back to the repository but

5. 5

   Step 5: if another member of your team has committed an updated version of the file in question

6. 6

   Step 6: TortoiseSVN will warn you that your working copy is out of date.

7. 7

   Step 7: Click ‘OK’ and TortoiseSVN will ask whether you wish to run ‘SVN Update.’ Select the ‘Update’ button.

8. 8

   Step 8: Sometimes this is all that's required to resolve a conflict but

9. 9

   Step 9: if you have modified the exact same part of the exact same file as your teammate

10. 10

    Step 10: TortoiseSVN will warn that one or more of your files are in a conflicted state.

11. 11

    Step 11: To resolve the conflict

12. 12

    Step 12: open the corresponding folder in your working copy.

13. 13

    Step 13: Use the original file to manually merge the changes between the repository’s version and your local version.

14. 14

    Step 14: When you have finished

15. 15

    Step 15: delete all the duplicates.

16. 16

    Step 16: Right-click on the file and select ‘SVN Commit...’

17. 17

    Step 17: Your modified file will now successfully be committed to the repository!

Detailed Guide

About the Author