[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Branches
From: |
Ray Booysen |
Subject: |
Re: Branches |
Date: |
Fri, 23 Jun 2006 14:22:26 +0100 |
User-agent: |
Thunderbird 3.0a1 (Windows/20060622) |
Gerhard Siegesmund wrote:
I'm a little unclear on the implications of a merge between a branch and
the trunk. If I merge, does the branch become part of the trunk from
then on?
Take a look at
http://cvsbook.red-bean.com/cvsbook.html#Branches
Merging merely creates a patch from the root of the branch (if you
tagged it!) to the head of the branch and applies it to your target
(which can be HEAD). So there is no real connection between branch tip
and trunk. The changes nevertheless afterwards are part of trunk. In
this paradigm you create branches and leave them after finishing the
feature and merged the changes to trunk.
HTH
Hi
Thanks for the link.
Regards
Ray
------------------------------------------------------------------------
_______________________________________________
info-cvs mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/info-cvs
--
Ray Booysen
address@hidden
RE: Branches, CARTER-HITCHIN, David, GBM, 2006/06/23
RE: Branches, CARTER-HITCHIN, David, GBM, 2006/06/26
Re: Branches, Pierre Asselin, 2006/06/26
RE: Branches, CARTER-HITCHIN, David, GBM, 2006/06/28