[Subclipse-users] Re: Resolving conflict with quick fix

Per Arnold Blåsmo <pablaasmo <at> atmel.com> writes:

> 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.
>
Actually the command that subclipse seems to execute is:

revert -N file.nn

And that will throw away my local changes and leave the file like the last
committed file. That means that if I had made some local changes that where not
committed, the file ends up differently from all the files that I try to merge.

That have to be an error?

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 11:04:51 2007