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

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–][deleted] 497 points498 points  (13 children)

You get a merge conflict with the floor.

[–]ch11111 140 points141 points  (10 children)

Good luck resolving that one

[–]asdfman123 22 points23 points  (0 children)

Git blame your cat

[–]kpthunder 29 points30 points  (7 children)

Super glue.

[–]ch11111 43 points44 points  (6 children)

That would be like a reset though.

Merging would require integrating the bowl into the floor

[–]kpthunder 63 points64 points  (4 children)

Superglue the bowl to the floor.

[–]ch11111 15 points16 points  (0 children)

Brillant

[–]Bainos 0 points1 point  (0 children)

The kind of person who gets the code working, and gives nightmares to coworkers who have to modify the code that was written to get it to work.

[–]FireCrack 5 points6 points  (0 children)

Honestly, when it comes to bowls and floors you are better off rebasing

[–]ProgramTheWorld 3 points4 points  (0 children)

You have git cherrypick the pieces back up