[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Subclipse denies to safe solved conflicts

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-02-28 16:53:50 CET

"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.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 28 18:31:50 2006

This is an archived mail posted to the Subversion Users mailing list.