You must log in or register to comment.
if u ever get a tricky merge conflict, just
git push --force
. this automatically works out the right code to keep (your own)So you’re going to git gud?
- git pull
- git reset --hard HEAD
- try not to cry
- cry a lot