u96sla
Last Updated: February 25, 2016
·
725
· luke_ar

Keep local file after merge conflict

git

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