git-guide/merging.md