Programmer Humor

32479 readers

687 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.

founded 5 years ago

MODERATORS

AgreeableLandscape@lemmy.ml

cat_programmer@lemmy.ml

276

git discussion bingo (media.mas.to)

submitted 11 months ago by yogthos@lemmy.ml to c/programmerhumor@lemmy.ml

30 comments fedilink hide all child comments

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

[–] eclectic_electron@sh.itjust.works 2 points 11 months ago (1 children)

What's your workflow that merging into other people's WIP is normal? I'm so confused

[–] steph@lemmy.clueware.org 2 points 11 months ago

A merge from upstream once a day, at the beginning of the day.

I'm working on a DevOps setting, and even though we're a small team, we have about two to three changes going through the pipeline a day.

If you keep your fork too long without syncing, it just get more complicated to merge, and more importantly if you need help from the upstream change author they'll have moved on to another subject and the change won't be as fresh in their mind as if you had merged the day after they pushed it.