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

Re: How does 'merge' work?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-10-21 19:33:45 CEST

Ben Collins-Sussman <sussman@collab.net> writes:

> * 'svn merge', runs diff3 between two downloaded tmpfiles and your
> working file. So I guess it *is* still possible to get conflict
> markers. It's just that in Dmitry's particular case, 2 of the 3
> files were indeed still the same.
>
> Am I understanding correctly, Philip?

Yes. 

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 21 19:34:26 2002

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

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