Merging branches

     git merge experiment

     git status

     cat pie

     ... resolve conflict ...

     git add pie

     git commit

     git log --decorate --all --graph

This is how conflicting changes from different people are resolved

Next

https://perl.plover.com/yak/git-intro/