Change to GitFlow workflow

[jeanluct]

After 2.2:

• Move development to "develop" branch.
• Master now only contains releases, with tags "release-X.Y.Z", etc.
• New features get their own branch, with parent "develop".
• New features get merged into "develop" when ready.
• Create release branch "release-X.Y.Z-branch" when getting ready for release (feature freeze, polish).
• Merge release branches into "master", tag master with "release-X.Y.Z".
• The only time we branch off "master" is for a hotfix (small but important bug fix). The hotfix gets its own branch and is merged back into "master" and "develop".
• The "devel" folder should only exist in the "develop" branch. It should not be merged into the release branches or into "master".

See https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

[jeanluct]

Created branches develop and release-2.2-branch.

Removed devel folder in 402d468 on release-2.2-branch.

[jeanluct]

This is useful for what to do with development branches once a feature is merged:

http://stackoverflow.com/questions/8614112/how-to-close-off-a-git-branch

Basically, you tag the branch and then delete it. Branches are only pointers, as are tags. The difference is that branches are also heads, and move with each commit.

[jeanluct]

Better to merge from the branch you want to merge into:

http://stackoverflow.com/questions/7644276/merging-to-branches-doesnt-matter-which-one-you-merge-into

[jeanluct]

Sometimes it might be helpful to avoid the "merge commit" when pulling by using git pull --rebase origin master.

[jeanluct]

This is helpful: http://nvie.com/posts/a-successful-git-branching-model/

[jeanluct]

Some notes on GitFlow style after release-3.0

Ok, the first merge from develop to release-3.0-branch to master went pretty well. The only mishap was to leave some files in the devel folder that got merged in from develop with no conflict, so to avoid extra commits on master I rolled back master with git reset --hard. (I miss Mercurial's rollback!)

Also, make sure to merge from master with git merge --no-ff to avoid a string of commits on master.

Finally, what's the use of the release branch? I guess it's a good idea to keep things clean (for deleting devel, for instance), but there not much point in creating it unless there's a string of bugfixes to be done. But don't delete devel until right before we're ready to merge into master.

[jeanluct]

Closing this, to be used later for reference.

[jeanluct]

Moved this info to https://github.com/jeanluct/braidlab/wiki/braidflow-worflow.