Nov 10, 2018

Resolve conflicts: git checkout ours vs theirs

$ git checkout --theirs filename(s)
This says that the file(s) being merged in take precedence over the file(s) in place in the branch, thus running this will overwrite the file(s) on the branch. --ours is the opposite in that the file(s) on the branch take precedence in this merge.