Comments on "Git collaborative workflow for command line"

[ThierryO]

Refers to #20

• use git pull instead of git fetch + merge
• don't use git rebase
• you don't have to create branches for master, it all depends on the branching strategy!
• you'll need git push -u the first time you push a new branch

[stijnvanhoey]

With respect to the git fetch/merge versus pull and the rebase, the proposed workflow is based on my previous experience at the university, where this provided us a solid workflow, with a clean (and easy searchable) history/tree and minimal conflicts. Therefore, I highly recommend to use this strategy, which also nicely corresponds to what Github Desktop provides. It is inspired by http://hayd.github.io/ (certainly check the presentation)

It is indeed true that it is not necessary to branch from the master, but it is our recommendation to use the Github workflow, which provides the power of branching, while keeping things clear.

[stijnvanhoey]

As we agreed on the merging and adapted course material in https://github.com/inbo/git-course closing here