git
the distributed version control system built for the Linux kernel is widely used
nowadays and has been adapted by more and more dev-teams. Developing with git
in a small team requires a different workflow to push/pull/merge/rebase
without any problems. This post describes a minimal workflow, which builds up on
feature branches on which the developer implements their changes. The
master
-branch tracks the remote changes and the feature branch will be merged
into master
if the work is done.