title: Quickly resolving GIT merge conflict with --theirs
body: <p>I have a branch called 'feature_game_rooms'. I would like to merge this branch into master. I basically want master to be an exact copy of feature_game_rooms. Heres what I've tried<br>
  1. <code>git checkout master</code><br>
  2. <code>git merge feature_game_rooms</code> ---> results in Automatic merge failed; fix conflicts and then commit the result. <br>
  3. <code>git add .</code><br>
  4. <code>git checkout --theirs .</code><br>
  This resulted in a compilation errors though because the conflict markers are still in my files.<br><br>
  Heres what git status looks like after <code>git merge feature_game_rooms</code>:<br><br>
  <a href="https://i.stack.imgur.com/kmld0.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/kmld0.png" alt="enter image description here"></a></p>