this post was submitted on 10 Sep 2023
800 points (98.3% liked)

Programmer Humor

19623 readers
411 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

founded 1 year ago
MODERATORS
Feyter@programming.dev
anzo@programming.dev
BurningTurtle@programming.dev
pylapp@programming.dev
800
Some people just wake up and choose violence (lemmy.world)
submitted 1 year ago by alphacyberranger@lemmy.world to c/programmer_humor@programming.dev
73 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] Stumblinbear@pawb.social 4 points 1 year ago (1 children)

He says as though he's never had two PR merges conflict logically with each other

[–] jabberati@social.anoxinon.de 0 points 1 year ago (1 children)

@Stumblinbear I only worked on small projects so far, that's probably why I don't understand it. But a merge commit is like any other commit and the person pushing this commit has to make sure it works.

[–] Stumblinbear@pawb.social 1 points 1 year ago* (last edited 1 year ago)

When working in teams, merging in two pull requests with seemingly unrelated changes is common practice. If I had to rebase and re-run tests every time another PR got merged in while mine was awaiting reviews, I'd spend most of my time running tests