Don't forget to git push --force to resolve conflicts!

We have a company taser for people who do this.

You have to self-tase one second for every commmit you blew away.

Top score is 4 seconds.

I'm not a fan of complicated git flows, but are there really people who force push to resolve conflicts? I mean professional developers who do this on real projects?

Nothing wrong with doing that on a feature branch after rebasing, as long as you are sure no-one else has pushed any changes to that branch in the meantime. Although personally i prefer --force-with-lease, which will warn you if that's happened.

If anybody pulled in the meantime and they don't know you are forced pushing they also might get in trouble because of your force push.

If you have conflicts on a feature branch I guess you aren't the only one working on it and as soon as that's the case force pushing is generally a bad idea unless you coordinate carefully with the test of the team.

The only time I ever force push is on a feature branch that only I work on and I want to amend the commit I just pushed a second ago.

I hesitate to call folks who do this "professional", but yes. I have also worked around people who blindly resolve all conflicts with their version and then comment out the failing tests.

your company is a frat house?

Don't work => don't self-tase.

I am not convinced. Instead, you'd need a reward for every cleanly committed line of code.

Also next time you need to deploy you can just use --amend to avoid having to think of new commit messages

I do it when I push to staging on Heroku :)

As an elixir dev the "no test needed" hurt. As someone that had to deal with explaining why VCS is important it burns.

But elixir does not have main file so it is ok :p