Re: How does 'merge' work?

Philip Martin <philip@codematters.co.uk> writes:

> $ vi dir/a.txt
> $ svn ci dir
> Sending dir/a.txt
> Committed revision 423.
> $ svn merge -r422:423 dir dir_branch
>
> This merge gets a patch that represents the changes made to dir and
> then uses a three-way diff to apply the patch to dir_branch. Whether
> you get conflicts depends on what you have done to dir_branch since
> you copied it.

Right. The immediate thoughts that came to my head were:

 1. merge applies patches to your tree.
 2. you can't *ever* get a conflict, unless you have local mods.

:-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 21 18:44:17 2002