1.1 --- a/en/branch.tex	Mon Apr 16 17:21:38 2007 -0700
     1.2 +++ b/en/branch.tex	Mon Apr 16 17:37:27 2007 -0700
     1.3 @@ -208,7 +208,21 @@
     1.4  isolated and unabated, in the \texttt{myproject} repository.
     1.5  \interaction{branch-repo.new}
     1.6  
     1.7 -
     1.8 +\section{Don't repeat yourself: merging across branches}
     1.9 +
    1.10 +In many cases, if you have a bug to fix on a maintenance branch, the
    1.11 +chances are good that the bug exists on your project's main branch
    1.12 +(and possibly other maintenance branches, too).  It's a rare developer
    1.13 +who wants to fix the same bug multiple times, so let's look at a few
    1.14 +ways that Mercurial can help you to manage these bugfixes without
    1.15 +duplicating your work.
    1.16 +
    1.17 +In the simplest instance, all you need to do is pull changes from your
    1.18 +maintenance branch into your local clone of the target branch.
    1.19 +\interaction{branch-repo.pull}
    1.20 +You'll then need to merge the heads of the two branches, and push back
    1.21 +to the main branch.
    1.22 +\interaction{branch-repo.merge}
    1.23  
    1.24  %%% Local Variables: 
    1.25  %%% mode: latex