How to resolve conflicts in Eclipse Subclipse

Question

Using Subclipse and SVN 1.6

When synchronizing views with the repository, you get conflicting files, and you can edit them manually. But sometimes you accidentally update, getting many versions of your file. Example:

File.source File.source.mine File.source.r5875 File.source.r6150 

I would like to understand what the logic of these files is and what tools Subclipse provides for comparing these files. Has File.source been merged with any versions? Is the .mine file the one who only has my changes?

thanks

Answer 1

Using the sample files you posted:

File.source.r5875 This is a patch that you previously checked before making changes.

File.source.r6150 This is a revision in the repository that is contrary to your local changes. This should be the latest version since you just made an update.

File.source.mine . This is your local version before which you upgraded. Thus, this file will have your changes.

File.source . This is a "controversial" version, including both your modifications and those from the r6150 together. Conflicting sections are divided into "→ → →" "======" and "<<<<lt;

The standard eclipse comparison tools let you compare different versions. Select 2 files, right-click and select Compare With> Each Other in the menu.

By comparing File.source.r5875 with File.source.mine, you can determine what you changed.

By comparing File.source.r5875 with File.source.r6150, you can determine what has changed in the repository since the last update.

Answer 2

This happens when svn encounters a conflict: you changed the file, the file on the server was modified, and it cannot (easily) be merged automatically. You must decide what is the right decision now.

Subversion simply adds diff to your source file (and creates files next to it called OriginalName.mine (unchanged) and OriginalName.rsomething (unchanged, server version)).

Correct the conflict and let it be resolved.

1) Just save your local changes no matter what you edited in the file

2) return the file

3) update it from SVN

4) Paste your local changes