21 February 2016
This article is about the common problem one faces, when working with feature branches.
At one point in time one wants to reintegrate a feature (branch) back into the current development branch (often called master or development).
Git offers two different approaches for this:
The simplest one is a
git merge which creates a new commit containing the complete diff of the two branches.
The other but more complex one is a combination of
git rebase and
These two commands in combination allows a user to merge not just only the file diffs but also preserves the complete history of the feature branch which may be helpful in most cases since the commit messages contain relevant information as well.