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

conflict editor

From: Tom Heaton <Tom.Heaton_at_cellectivity.com>
Date: 2005-07-05 17:05:27 CEST

I don't understand how this works. It shows the conflicts very nicely and I can move between merged/their versions. But I can't mark a conflict as resolved and get rid of all the additional subversion file versions.
 
Is there an equivalent of Tortoise's "use their/your text block".

Received on Wed Jul 6 01:05:27 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.