Keep local file after merge conflict
If you have a merge conflict and you're absolutely sure your file is the correct one, you may try:
git checkout --ours filename.groovy
Written by Lucas
Related protips
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Git
Authors
Related Tags
#git
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#