I can never remember how to keep the local version of a file when a git merge has a conflict. Following this blog. To keep OUR copy of the file index.html after a git merge
git reset -- index.html
git checkout ORIG_HEAD -- index.html
git commit -a
-
December 2024 M T W T F S S 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31