It's definitely friday in the office.

Saphe!

very effective

Stupid question, but does this retain git history ? Or will everything be overwritten

@alertJS It basically forces the remote branch to look exactly like your local copy. Therefore commits will only change back to your last pull from that branch. Think of it like "resolve all using mine and discard everything else". So yes, other's commits since your last pull will be deleted from history.

@Ajite

God help us all. Isn't their a way to force push , yet retain the remotes history ?

@alertJS Wouldn't that just destroy the purpose of force push? :D Anyway, there are those rare situations when you want to rewrite history, just make sure you know what you're doing.

Most of the Repo's I commit to I am the only person committing to them, and recently I coded myself into a big 'ol fucking mess, and in my clean up caused way more conflicts than I was willing to go through...So push force...Felt sooooo much shame...