Programmer Humor

31948 readers

393 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 3 years ago

MODERATORS

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

Boys, don't dev alone or you'll end up with a git log like mine (lemmy.world)

submitted 23 hours ago* (last edited 23 hours ago) by Gonzako@lemmy.world to c/programmer_humor@programming.dev

71 comments fedilink hide all child comments

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

[–] thoughtfuldragon@lemmy.blahaj.zone 9 points 21 hours ago* (last edited 21 hours ago) (2 children)

git branches are free
work in your tree
til the changes are ready
300 git push --force-with-lease a day and nobody mad

[–] Evotech@lemmy.world 2 points 18 hours ago (1 children)

Continuous integration is better. Fight me

[–] thoughtfuldragon@lemmy.blahaj.zone 4 points 16 hours ago (1 children)

Nothing about continuous integration prevents you from using a branch to prepare your changes.

[–] Evotech@lemmy.world 1 points 15 hours ago* (last edited 14 hours ago) (1 children)

Yes, if you use feature branches its literally not continuous. It’s adjacent though.

Continuous Integration is a software development practice where each member of a team merges their changes into a codebase together with their colleagues changes at least daily

Meaning everything is in a version controlled mainline

People disagree about what CI is, but that’s the definition i subscribe to

[–] exu@feditown.com 1 points 14 hours ago (2 children)

So does everyone work directly on main all the time? Do all of you work on the same project or are there multiple with one person per project? How do you work around the broken code your coworker just pushed so you can finish your tasks?

[–] Evotech@lemmy.world 2 points 14 hours ago* (last edited 14 hours ago) (2 children)

Yea you always work on main on the same project.

You don’t push broken code. You always need to keep mainline healthy

It takes some special considerations, but the benefits are great.

[–] exu@feditown.com 1 points 4 hours ago

That doesn't stop you from removing your test commits before pushing

[–] kewjo@lemmy.world 2 points 13 hours ago (1 children)

so when something breaks both devs, the one who made the previous change and the person pushing new, have to work together to solve the issue? no PRs or is everything a fork? do you revert and rebase every change?

[–] Evotech@lemmy.world 2 points 13 hours ago* (last edited 13 hours ago)

You revert the broken commit usually.

https://martinfowler.com/articles/continuousIntegration.html

This is a good article on the topic

[–] Gonzako@lemmy.world 1 points 14 hours ago

I personally make feature files. So if i'm working on FactorySeederModemLookupVector.ts someone elses could work on ☝️🥵🙏.php without bothering each other. Tho, my collabs have been ones with a LOT of communication.

[–] defaultusername@lemmy.dbzer0.com 2 points 20 hours ago (1 children)

I prefer to force push directly to the production branch.

[–] thoughtfuldragon@lemmy.blahaj.zone 2 points 16 hours ago

computer equivalent of being a nudist