I personally think, we should stay as simple as possible here... I explicitly used the local master branch so people also update it with the most recent commits and not only fetch them. Not sure what is better here though. Other opinions?