Working on several branches at the same time

[James Westby]

On Sun, 2008-06-15 at 18:35 +0900, David Cournapeau wrote:
> Hi,
> 
>     I have recently encountered the following situation:
> 
> - I have a branch mainline, from which I want to add a new feature
> - I am working on a new feature in branch newfeat.
> - While working on newfeat, I realize something is broken, which 
> prevents me from working further in newfeat.
> - I create another branch from mainline to fix the bug.
> 
> How do I go after that ? I need the fix to finish new feat, so I need to 
> put the fix into newfeat, somewhat. But the fix itself has nothing to do 
> with newfeat, so it makes sense to put it into mainline too ? I could do 
> it with rebase, but is there another recommended way of dealing with 
> this case ?

Hi,

My first reaction would be to merge the fix in to mainline, and then 
merge mainline in to newfeat. Does that suit you?

Thanks,

James