this post was submitted on 19 Nov 2025
549 points (97.7% liked)

Selfhosted

53066 readers
418 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:

  1. Be civil: we're here to support and learn from one another. Insults won't be tolerated. Flame wars are frowned upon.

  2. No spam posting.

  3. 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.

  4. Don't duplicate the full text of your blog or github here. Just post the link for folks to click.

  5. Submission headline should match the article title (don’t cherry-pick information from the title to fit your agenda).

  6. No trolling.

Resources:

Any issues on the community? Report it using the report flag.

Questions? DM the mods!

founded 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
[–] Psythik@lemmy.world 1 points 1 day ago* (last edited 1 day ago) (1 children)

Okay, so the answer basically is that you can't have multiple people working on overlapping bits of code, not without someone sorting it out first.

Being able to have two different people work on different parts of the same file without causing any issues makes sense, but I also thought there was some magic formula that fixes everything if two people try to upload the file with the same part of the code modified in two different ways at the same time.

Git is not as magical as I thought it was now that you've explained it.

[–] elephantium@lemmy.world 2 points 1 day ago

Yeah, it's fairly clever but not actually magical. Sometimes you have to go in and take a look.

Actually, the real magic is that it works out mostly ok most of the time. Much better than older systems where you would have to "check out" a file to work on it which would lock others out. I've heard older programmers talk about needing to go find someone who had a file checked out and have them check it back in to enable them to do some work.