Experimenting with "git merge" (fast-forward & recursive)