[Subclipse-users] Resolving conflict with quick fix

I have done a merge with my workspace and have a couple of problems/conflicts
after the merge.

After a conflict I will have 4 files:

file.nn
file.nn.merge-left.rXXXX
file.nn.merge-right.rXXXX
file.nn.working

To solve those conflicts I have 2 options, either use 'Edit Conflicts' or use
'Quick Fix' from the problems view.

Using 'Edit Conflicts' brings up the Compare Editor and lets me semi manually
fix differences. The compare editor seems to bring up 'file.nn.working' and
'file.nn.merge-right.rXXXX' and lets me move fixes from right to left. The
'file-nn-merge-right.rXXXX' is called 'theirs'.

But sometimes I just want to use one of the original files and not do a merge.
For that I have 'Quick Fix'. Choosing 'Quick Fix' when right clicking the
selected problem in the problems view brings up a new window where I can choose
which one.

The choices I get is:
- Edit Conflicts
- Accept my revision
- Accept their revision
- Mark conflict as resolved

I my case I wanted to choose accept their revision. I believe that this would
mean that the file 'file.nn.merge-right.rXXXX' was chosen since 'Edit Conflicts'
names that file as 'their'.

But here is the error, Doing that chooses the 'file.nn.working'! Then subclipse
automatically resolves the conflict and removes the merge files and leaves the
chosen version of the file.

This is not what I expected.

I have tried to search the documentation for an explanation on how it works, but
have not found any. I have also searched Google.

Can any body give me a link or a explanation how to solve this without a lot of
 manual actions and copying?

Per A.
  

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Mar 8 09:35:49 2007