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

[Subclipse-users] Merging conflicts one way only

From: Kiren Pillay <kiren_at_setaskill.co.za>
Date: 2007-06-22 10:40:59 CEST

I am trying to resolve a conflict, and the diff window only allows me to copy
changes from the repository's version to my side (ie. incoming only).

In tortoiseSVN I can copy changes in either direction.

Is this a bug? 

-- 
View this message in context: http://www.nabble.com/Merging-conflicts-one-way-only-tf3963441.html#a11248265
Sent from the subclipse - users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Jun 22 10:40:47 2007

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.