[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Q] synching main branch changes into a branch

From: Donald Sharp
Subject: Re: [Q] synching main branch changes into a branch
Date: Mon, 27 Nov 2000 13:34:28 -0500
User-agent: Mutt/1.2.4i

You should be able to merge any way that you want to.  Just remember
to lay down labels that you can use for the next merge...

On Mon, Nov 27, 2000 at 05:56:54PM +0100, Steinar Bang wrote:
> >>>>> Donald Sharp <address@hidden>:
> > You want to merge into the branch.  Your method would cause you
> > problems if you made a change in a file on your branch and a change
> > was made on mainline.  See Chapter 5 of the cvs manual, Branching
> > and merging.  Specifically section(s) 5.6 and 5.7.
> Hm... that means it is possible to do multiple merges from the main
> branch and into a side branch?
> I've always read the eg. the section "Merging more than once" (I'm
> reading this using Emacs' Info reader, so I don't have the section
> numbers handy) to mean that these merges can only be from a side
> branch and into the main branch.
> Hm... when I read it now, it doesn't say so explicitly, but the
> examples seem to hint at it.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]