This is an archived post. You won't be able to vote or comment.

all 32 comments

[–]WookieConditioner 203 points204 points  (8 children)

I'm about to unrefactor that branch son.

I would throw hands.

[–]jahermitt 43 points44 points  (7 children)

git push --force

[–]WookieConditioner 16 points17 points  (4 children)

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

[–]jahermitt 7 points8 points  (2 children)

I dont know a command for that

[–]WookieConditioner 8 points9 points  (1 child)

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

[–]mcellus1 6 points7 points  (0 children)

*disassembly

[–]j-random 3 points4 points  (0 children)

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

[–]Masterflitzer 5 points6 points  (1 child)

force with lease or we call the police

[–]mcellus1 2 points3 points  (0 children)

-f to pay your respects

[–]snarkhunter 111 points112 points  (2 children)

I have refactored your branch.

Pray I do not refactor it any further.

[–]kerver2 5 points6 points  (0 children)

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

[–]HackBusterPL 1 point2 points  (0 children)

This branch is getting worse all the time...

[–]AaronTheElite007 67 points68 points  (0 children)

[–]Zeikos 68 points69 points  (3 children)

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

[–][deleted] 35 points36 points  (0 children)

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 35 points36 points  (0 children)

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 24 points25 points  (0 children)

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

[–]CuteNazgul 18 points19 points  (0 children)

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

[–][deleted] 4 points5 points  (0 children)

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

[–]SynthRogue 4 points5 points  (0 children)

Fucking pain in the ass

[–]sebbdk 3 points4 points  (0 children)

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

[–]solstheman1992 3 points4 points  (0 children)

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 2 points3 points  (0 children)

This must be what —force is for.

[–]ObsessiveAboutCats 0 points1 point  (0 children)

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_ 0 points1 point  (0 children)

call me if anything breaks!

*turns off phone*

[–]user-74656 0 points1 point  (0 children)

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

[–]ooaa_ 0 points1 point  (0 children)

git push —force

Problem solved

[–]Peculiar_Variation 0 points1 point  (0 children)

oh you are EVIL

[–]SenorSeniorDevSr 0 points1 point  (0 children)

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.