Use git flow project management/branching model

[M4a1x]

I suggest to start developing according to Vincent Driessen (It's not that complicated). I also suggest altering the model to push feature branches to origin as well for review purposes.

Here you may find the thorough explanation:
http://nvie.com/posts/a-successful-git-branching-model/

One may also use this git extension (Though it's not necessary):
https://github.com/nvie/gitflow

[Inrin]

I'm in favor of it. But I don't think, that all used to use a shell...

[M4a1x]

I don't think you have to use a shell.. Very simplified it says:
"All work is made on seperate branches, when one feature is ready, merge it to develop, if there are enough features in develop for a new release, merge it with master" (leaving aside the hotfix and release branches).
So basically the only thing they have to do is to create a new branch for every feature they introduce and commit only to those branches. Or do I miss something here?

[Inrin]

I know, but is it possible to use parameters like --no-ff in the GUI?

[M4a1x]

I would set this the default anyway, so just open the cmd once and enter:
git config --global merge.ff no

and you'll never have to worry about that again 😄