Resolving Git Merge Conflicts

Documentation is a little thick. Found a simpler explanation over here:

git checkout --ours filename.c  # to keep our change, or
git checkout --theirs filename.c # to use theirs
git add filename.c
git commit -m "using theirs" 

Now git pull origin master doesn’t explode.

Add picture from clipboard (Maximum size: 1 GB)