34
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 19 Nov 2025
34 points (100.0% liked)
Selfhosted
53065 readers
88 users here now
A place to share alternatives to popular online services that can be self-hosted without giving up privacy or locking you into a service you don't control.
Rules:
-
Be civil: we're here to support and learn from one another. Insults won't be tolerated. Flame wars are frowned upon.
-
No spam posting.
-
Posts have to be centered around self-hosting. There are other communities for discussing hardware or home computing. If it's not obvious why your post topic revolves around selfhosting, please include details to make it clear.
-
Don't duplicate the full text of your blog or github here. Just post the link for folks to click.
-
Submission headline should match the article title (don’t cherry-pick information from the title to fit your agenda).
-
No trolling.
Resources:
- selfh.st Newsletter and index of selfhosted software and apps
- awesome-selfhosted software
- awesome-sysadmin resources
- Self-Hosted Podcast from Jupiter Broadcasting
Any issues on the community? Report it using the report flag.
Questions? DM the mods!
founded 2 years ago
MODERATORS
The part that confuses me is: How can multiple people work on overlapping bits of code at the same time, and the Git manager (or whatever you call it) just handles it all without breaking everything?
Roughly equal parts "git is clever" and "once in a while, someone has to take some time to figure it out".
Say the code is split into two files. You and I both make changes, but you're working on file A and I'm in file B. No problem!
Now we both make changes in file A. Sometimes Git can just "figure it out", like if all your changes are in the beginning of the file, and all my changes are at the end.
But sometimes we both change the same section. Git can't figure that part out, so one of us has to sit down and reconcile the changes. Sometimes this is pretty simple, other times...not so much.
Put it all together, and it works out pretty well most of the time.