geda-developers team mailing list archive

[Gareth Edwards <gareth@xxxxxxxxxxxxxxxxxxxx>]

Hi Peter,

Welcome back!

On 13 November 2012 18:21, Peter TB Brett <peter@xxxxxxxxxxxxx> wrote:
>
> It looks like there have been both bug fixes and new features going into
> 'master', which has confused things slightly.  There are two options:
>
...
>
> - Persuade Gareth to cherry pick any relevant bugfixes into
>   'stable-1.8'.
>
> I personally vote for the latter option.
>

Sure, I'm happy to do that - but I think I need to understand your
branch/merge strategy around stable branches and master better, which
is why I stayed away from stable-1.8 in my recent commits. (I'm more
used to a workflow where changes move from softer to firmer on the
tofu scale but the stable stuff in geda seems to move/merge in the
other direction.

Cheers
Gareth