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

Subclipse denies to safe solved conflicts

From: Markus Karg <markus.karg_at_quipsy.de>
Date: 2006-02-28 15:48:40 CET

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?
 
Markus
Received on Tue Feb 28 16:40:55 2006

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