Git: Conflict Resolution By Choosing A Copy

Often, it is as simple as choosing either the local copy in its entirety or the remote copy in its entirety.

In this case, use the following commands:

1. Use local copy: git checkout --ours FILENAME
2. Use remote copy: git checkout --theirs FILENAME

Reference: http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html