COmanage Developers List

[Benn Oshrin <>]

I've been trying to work out a git strategy for bugfixes that seems easy
to understand and track. We've talked about it before, but I don't think
we've settled on anything really, so here's my proposal:

(1) develop continues to be candidate changes to merge into master
    (ie: the next minor release).
(2) Once at least one issue has been assigned to the bugfix release
    (eg: 1.0.1), we create a new branch from the appropriate parent
    release (ie: develop-1.0.1).
(3) Appropriate fixes are pushed to develop-x.y.z, NOT to develop.
(4) When ready, develop-x.y.z is merged into master and the usual
    release process is followed.
(5) master is then merged into develop. (Or develop-x.y.z, I suppose
    it doesn't matter.)

I think this avoids cherry picking as part of the process, which seems
cleaner to me.

Thoughts?

Thanks,

-Benn-