game-with-git 2 changes 2 changes 3 changes 4 changes 5 changes 6 changes cherry pick demo for git merge