566
submitted 11 months ago by Cyber@feddit.uk to c/selfhosted@lemmy.world
you are viewing a single comment's thread
view the rest of the comments
[-] Psythik@lemmy.world 1 points 11 months ago* (last edited 11 months ago)

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 11 months 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.

this post was submitted on 19 Nov 2025
566 points (97.8% liked)

Selfhosted

63501 readers
823 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:

Detailed Rules Post

  1. Be civil.

  2. No spam.

  3. Posts are to be related to self-hosting.

  4. Don't duplicate the full text of your blog or readme if you're providing a link.

  5. Submission headline should match the article title.

  6. No trolling.

  7. Promotion posts require active participation, with an account that is at least 30 days old. F/LOSS without a paywall has exceptions, with requirements. See the rules link for details. Tags [CBH] or [AIP] are required, see the links in Rule 8 for details.

  8. AI-related discussions and AI-involved promotional posts have additional requirements for tagging, as noted in Rule 7 and the AI & Promotional Post Expanded Rules post, and find example disclosures here.

Resources:

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

Questions? DM the mods!

founded 3 years ago
MODERATORS