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)Also, a way to never have to work again!
Except if you’re an employer in a very small company.
Source: my boss did this at the first company I worked at.