developer-manual: Add git commands that should result in a merge-free history