Best practices for merging

[Kevin Bullock]

On May 26, 2011, at 11:33 AM, Detlev Offenbach wrote:

> Hello,
> 
> I have the following situation I would like to know how to do it the best way.
> 
> I have two development branches. Branch A (default) is the feature branch, 
> where I do the ongoing development. Branch B is the current maintenance branch 
> that receives just bug fixes. When I fixed a bug in branch B and committed it, 
> I would like to copy the same changeset to branch A in order to not do the 
> changes twice.

Just merge. So long as you're making bugfixes on the maintenance branch and forward-merging them onto default, it'll come out right.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock