I just picked up a hobby project which I hadn't worked on in a while and started doing some major refactoring. However, I forgot to pull before I started and didn't realize that I made some updates on a different pc. Then as I wanted to push a ton of changes I noticed... I didn't even attempt to merge because it was one giant pile of shit conflicts - and I didn't remember what changes I had made earlier. So I decided to say fuck it and
$ git force --push

Feels *so* much better than pulling my hair out over conflicts :P

  • 1
    Let's hope you don't do the same thing on the other pc again 😵
  • 1
    Tried same thing on a work project. Thought I was the only one on the project... Had 3 days of work to merge. Serves me right not pushing changes often.
Add Comment