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