version control – How do I fix merge conflicts in Git? – Stack Overflow

git checkout --ours filename.c

git checkout --theirs filename.c

git add filename.c

git commit -m "using theirs"
via version control – How do I fix merge conflicts in Git? – Stack Overflow.

Leave a Reply