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

Stopping Merge on Conflict

From: Christopher Taylor <chtaylo3_at_hotmail.com>
Date: 2006-09-28 23:57:07 CEST

I'm not sure if this is a svn issue or a tortoisesvn issue, but is there a
way to stop the automatic attempt at merging when there's a changed-out of
date conflict?

Respectfully,
Christopher

_________________________________________________________________
Express yourself - download free Windows Live Messenger themes!
http://clk.atdmt.com/MSN/go/msnnkwme0020000001msn/direct/01/?href=http://imagine-msn.com/themes/vibe/default.aspx?locale=en-us&source=hmtagline

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Sep 28 23:57:13 2006

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