version control - Where does git merge fit in this diagram - Stack Overflow