Boys, don't dev alone or you'll end up with a git log like mine

submitted by edited

https://lemmy.world/pictrs/image/1dea8cfc-eab5-4c4d-92a9-6890b5a5885b.mp4

78
121

Back to main discussion

Parent comment

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

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?

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.

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?

You revert the broken commit usually.

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

This is a good article on the topic



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



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.




Insert image