Closed aisthesis closed 8 years ago
It looks like the most common git workflow is to have master
always be the decisive version--as opposed to the master -> staging -> release workflow that I've seen elsewhere. We should stick with the standard workflow.
That means that we should create a permanent branch develop
that will be decisive between versions. It will be merged into master
only when the new version is ready. All user branches should be created from develop
and merged into develop
.
Having a separate
develop
branch allows changes to be pushed there while still maintaining amaster
identical with the most recent published version. Here is what is involved:develop
from master.makefile
for the docs.develop
for code changes