<div id="Branching-and-merging"></div>
<div class="header">
<p>
Next: [[cvs: Recursive behavior#Recursive behavior|Recursive behavior]], Previous: [[cvs: Revisions#Revisions|Revisions]], Up: [[cvs#Top|Top]] &nbsp; |[[cvs: Index#SEC_Contents|Contents]]||[[cvs: Index#Index|Index]]|</p>
</div>

----

<div id="Branching-and-merging-1"></div>
== Branching and merging ==
<div id="index-Branching"></div>
<div id="index-Merging"></div>
<div id="index-Copying-changes"></div>
<div id="index-Main-trunk-and-branches"></div>
<div id="index-Revision-tree_002c-making-branches"></div>
<div id="index-Branches_002c-copying-changes-between"></div>
<div id="index-Changes_002c-copying-between-branches"></div>
<div id="index-Modifications_002c-copying-between-branches"></div>

<small>CVS</small> allows you to isolate changes onto a separate
line of development, known as a <em>branch</em>.  When you
change files on a branch, those changes do not appear
on the main trunk or other branches.

Later you can move changes from one branch to another
branch (or the main trunk) by <em>merging</em>.  Merging
involves first running <code>cvs update -j</code>, to merge
the changes into the working directory.
You can then commit that revision, and thus effectively
copy the changes onto another branch.

 [[cvs: What branches are good for#What branches are good for|&bull; Branches motivation]]::         What branches are good for
 [[cvs: Creating a branch#Creating a branch|&bull; Creating a branch]]::           Creating a branch
 [[cvs: Accessing branches#Accessing branches|&bull; Accessing branches]]::          Checking out and updating branches
 [[cvs: Branches and revisions#Branches and revisions|&bull; Branches and revisions]]::      Branches are reflected in revision numbers
 [[cvs: Magic branch numbers#Magic branch numbers|&bull; Magic branch numbers]]::        Magic branch numbers
 [[cvs: Merging an entire branch#Merging an entire branch|&bull; Merging a branch]]::            Merging an entire branch
 [[cvs: Merging from a branch several times#Merging from a branch several times|&bull; Merging more than once]]::      Merging from a branch several times
 [[cvs: Merging differences between any two revisions#Merging differences between any two revisions|&bull; Merging two revisions]]::       Merging differences between two revisions
 [[cvs: Merging can add or remove files#Merging can add or remove files|&bull; Merging adds and removals]]::   What if files are added or removed?
 [[cvs: Merging and keywords#Merging and keywords|&bull; Merging and keywords]]::        Avoiding conflicts due to keyword substitution

This document was generated on <i>a sunny day</i> using [http://www.nongnu.org/texi2html/ <i>texi2html</i>].
