Using Gitflow

In order to have the source code managed in a way that allows multiple developers to add features without a hassle, it is always a good idea to work on branches.
In my experience using gitflow is a way, that makes life much easier for everyone. Building releases, testing them and merging to master is as easy as entering some commands to the console.

Here are some links for you:
The git flow repos
a nice howto
a cheat sheet