Re: Incorrect merge

[Óscar Fuentes]

"Stephen J. Turnbull" <address@hidden> writes:

>  > > And what if you fix a bug in trunk, and only later realize it needs to
>  > > be backported?
>  > 
>  > And how is this different from the current workflow?
>
> It's not.  That's precisely my point.  You can reduce cherry-picking,
> but not eliminate it.

One thing is to resort to cherry-picking when some exceptional condition
is detected, and another thing is to use cherry-picking as a tool for an
ordinary task.

[snip]