Choose local or remote version in a merge conflict
From Git version 1.6.1 there are --ours and --theirs options for keeping only the local or remote version of a file with a merge conflict.
git checkout --ours <file_name>
git checkout --theirs <file_name>Really simple to use!
Related protips:
Written by Rostislav
Related protips
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Merge
Authors
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#