this post was submitted on 10 Sep 2023

799 points (98.3% liked)

Programmer Humor

19496 readers

750 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

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 1 year ago

MODERATORS

799

Some people just wake up and choose violence (lemmy.world)

submitted 1 year ago by [email protected] to c/programmer_humor

73 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 4 points 1 year ago (1 children)

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

[–] [email protected] 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.

[–] [email protected] 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