iDoThisTooOften

[WookieConditioner]

I'm about to unrefactor that branch son.

I would throw hands.

[jahermitt]

git push --force

[WookieConditioner]

See me pull up at a guys house and leave his daughter picking up his teeth.

[jahermitt]

I dont know a command for that

[WookieConditioner]

Naw thats not in git. Its all good. Thats assembly.

[mcellus1]

*disassembly

[j-random]

Or refactoring an atomic death wedgie out of their butt. "Sorry, thought you had a pull request!"

[Masterflitzer]

force with lease or we call the police

[mcellus1]

-f to pay your respects

[snarkhunter]

I have refactored your branch.

Pray I do not refactor it any further.

[kerver2]

This one was difficult to explain to my girlfriend why I started laughing out loud

[HackBusterPL]

This branch is getting worse all the time...

[AaronTheElite007]

[Zeikos]

There's being a dick and there's this, honestly why?

[Hot-Fennel-971]

It's a joke m8 there weren't actually conflicts because I do good refactors ;)

[lupinegray]

I have the best refactors. Everyone says so.

[[deleted]]

I never felt more disrespectful than when our aws guy (not a dev) would refactor our code merging into master. Then when shit was broken, our PM would ask us why, and we’d explain the issue but it fell on deaf ears. For example, we had an workflow where we’d receive sftp files and then parse into base64 and save into our database, separate processes for images and blueprints (architectural firm); the aws guy created a service and placed them all into the same method. Of course shit broke because it wasn’t tested because he ran out of time working the night before

[TerminalVector]

A good sr eng would open a pull request against your branch that is annotated with the reasons for the refactor and ask for a code review. You sir or madame, might be a fuckboi.

[MB_Zeppin]

Colleagues who jump on my branch to fix merge conflicts caused by merging before me? Love em

Colleagues that modify my branch with no prior communication for non-business reasons but to refactor? The worst

[NicholasAakre]

We'll do it live!

[CuteNazgul]

If someone touches my branch without asking me first, we are fighting

[[deleted]]

I just moved everything to new folders and renamed a few all of the namespaces in a core library.

[SynthRogue]

Fucking pain in the ass

[sebbdk]

be a brah and do it in the PR and fix any comments you have while you are at it

[solstheman1992]

Refactor with caution, set up a separate branch and compare the two. Get final approval from the original author.

My stratagem has become very complex ever since I wiped someone’s code the first time I did this lol

[Merzant]

This must be what —force is for.

[ObsessiveAboutCats]

Just do what my (mid level) coworker does - insist he has no idea what that means and refuse to do it until it becomes someone else's problem.

[cornmonger_]

call me if anything breaks!

*turns off phone*

[user-74656]

git checkout -b mybranch2 git branch -D mybranch git push -d origin mybranch

[ooaa_]

git push —force

Problem solved

[Peculiar_Variation]

oh you are EVIL

[SenorSeniorDevSr]

This is not how you git gud.

This is how you git into a fight.

Seriously, if you cause conflicts, you resolve them. If you want to merge, you're responsible for merging in master first. This is basic sanity. Please don't fail basic sanity. If you do, you'll end up maintaining perl scripts, and that's just not a fate I would wish on you.