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

[TSVN] Re: Re: Small bug in commit dialog

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-02-10 12:57:00 CET

Peter McNab wrote:
> Just wondering what "Automatically close if no merges" actually
> means"? If I'm attempting a merging is that something that couild
> actually occur? If there is a conflict, does that equate to no merge?
> Why not have the tickbox on the merge form itself?

No, this is refering to the fact that when you update, if someone else
has changed a file that you are also working on, their changes get
merged into yours in your WC. That's part of the update process. It's
not talking about the SVN merge command specifically.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Feb 10 13:05:24 2005

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

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