pull
git
pull
-X
theirs
git
commit
Interactive Graph
Table Of Contents
pull