Working on several branches at the same time

[James Westby]

On Sun, 2008-06-15 at 19:44 +0900, David Cournapeau wrote:
> James Westby wrote:
> >
> > Hi,
> >
> > My first reaction would be to merge the fix in to mainline, and then 
> > merge mainline in to newfeat. Does that suit you?
> >   
> 
> That's what I would do to at first. But in that case, you have several 
> times the same log when you merge back the new feature in the mainline, no ?

No, you should only have one real "fix bug" entry in the log. What you
will have though is more than one merge commit related to this process.

You probably have a choice of whether to merge or push to mainline,
unless there are other people pushing to mainline, or this process
is interrupted by other bug fixes. If you do merge though then that
gets you one merge commit.

When you merge mainline in to your feature branch then that will get
you another merge commit.

If you do not want these merge commits then rebase is the way to do it,
yes, but the merge commits shouldn't cause you any problems.

Thanks,

James