← Back to team overview

kicad-developers team mailing list archive

suggestion: git branching model



Perhaps it would make sense to adopt something like this?

In short, all development happens on 'develop' branch and only when
this is stable it's merged back to 'master'. One doesn't have to
follow the above model strictly, for example a merge into master
doesn't need to mean "new version to be released".

Another nice thing is that stuff that are work in progress and not yet
stable can live in a feature branch until it's stable enough to merge
into 'develop'. (For example the new symbol inheritance stuff, which
currently makes the master branch a bit unusable)

Maybe some of this makes sense, and some not? Just some thoughts while
trying to find a point in the master branch history that doesn't crash
all the time :)


Follow ups