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

AW: Subclipse denies to safe solved conflicts

From: Markus Karg <markus.karg_at_quipsy.de>
Date: 2006-03-01 08:15:25 CET

Yes, I'm quite aware of that but there was a typo in two of the mails I sent.
I already apologized for that.
But, once more, sorry.
 
Markus

 
________________________________

Von: Felix Gilcher [mailto:gilcher@exozet.com]
Gesendet: Di 28.02.2006 16:54
An: Markus Karg; users@subversion.tigris.org
Betreff: AW: Subclipse denies to safe solved conflicts

Markus Karg <mailto:markus.karg@quipsy.de> schrieb am Dienstag, 28. Februar 2006 15:49:

> 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!

You're aware that subclipse is a different projekt that is _based_ on subversion and that the subclipse guys have their own site at http://subclipse.tigris.org/ and their own mailinglist at users_at_subclipse.tigris.org. Maybe you'll get more (and better) answers there.

> How to make Subclipse safe my changes?
>
> Markus

Good Luck

felix

--
Felix Gilcher
Head of IT Development
Exozet Berlin GmbH
Rotherstraße 20
10245 Berlin
eMail: gilcher@exozet.com
URL: www.exozet.com
Received on Wed Mar 1 08:16:00 2006

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