Working on several branches at the same time

[Matthieu Moy]

David Cournapeau <david at ar.media.kyoto-u.ac.jp> writes:

> 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 ?

You'll have "fixed bug" and "merged bugfix" log messages. But that's
what happens anyway when you use branch and merges: the merge commits
sound redundant with the commits they merge ...

(and yes, "rebase" is a way to avoid that, but read about the possible
drawbacks before using it)

-- 
Matthieu