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

Re: Could merging be any more cumbersome?

From: Jacob Atzen <jacob_at_aub.dk>
Date: 2005-08-06 13:46:09 CEST

On Fri, Aug 05, 2005 at 01:19:59PM -0700, Rick Mann wrote:
> I never did think merging somehow combined branches. But I do think
> of merging as making one branch identical to another.

Which is of course not correct. Say branch B was branched from branch A
some time in the past T. Now you merge your changes from B back into A.
Suppose A have changed after T. In this case A and B are not identical
after the merge.

OTOH, after merging B into A you can think of branch A as the
combination of changes in B and changes in A.

I hope the above made some kind of sense ;-)

- Jacob Atzen
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 6 13:47:58 2005

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

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