Mark,
I am using "Team -> Edit Conflicts" from the context menu in the package explorer. The toolbar button is disabled, while the main menu "File -> Save" is enabled (but does nothing). Even after "Copy all non-conflicting changes from right to left" the "File -> Save" does nothing and the button stays disabled. CTRL-S does nothing. It seems, something lost track of the current state, so I rebooted Eclipse, but still the same. :-(
Mit freundlichem Gruss / With kind regards
Markus KARG, Staatl. gepr. Inf.
Entwicklung / R & D
QUIPSY QUALITY GmbH
________________________________
Von: Mark Phippard [mailto:markp@softlanding.com]
Gesendet: Di 28.02.2006 16:53
An: Markus Karg
Cc: users@subversion.tigris.org
Betreff: Re: Subclipse denies to safe solved conflicts
"Markus Karg" <markus.karg@quipsy.de> wrote on 02/28/2006 09:48:40 AM:
> I'm running Eclipse 3.1.1 on Windows XP, with Subclipse 0.9.108.
>
> I merged a branch into my local workspace.
> Then I went on a file, issued "Edit Conflicts" to solve a conflict
Subclipse showed me.
> I just clickt on the button to take over "Their" lines into "Mine".
> The solution looks correct.
>
> Now I want to save.
> But the menu item it disabled.
> Clicking CTRL+S doesn't do anything.
>
> There is still the asterisk in the title bar showing unsafed changes.
>
> When I close the view, the changes are gone. :-(
>
> Help please!
> How to make Subclipse safe my changes?
Again, wrong mailing list. You want users@subclipse.tigris.org.
I just tried this with eclipse 3.2 and it worked fine. I do not see an
option that says "theirs" over "mine" though so maybe I am not in the same
editor?
I did "Copy All Non-Conflicting Changes from Right to Left". And then did
Ctrl-S and it saved.
There is also a toolbar button to do a save if you want to try that.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Wed Mar 1 08:14:35 2006