|
Yeah, rebasing rewrites commit history instead of just appending to it, and any history-rewriting operation becomes a huge pain in the rear end if anyone else has a copy of the branch.
|
# ¿ Oct 7, 2023 19:22 |
|
|
# ¿ May 14, 2024 10:43 |
|
smackfu posted:Did CVS and SVN actually need a server like git, or could they just work with a shared network drive? SVN does need a server, it doesn't store the diffs locally. one of its worst features is that checking out a branch entails re-downloading all the files in the repository from the server, so if you try the typical git thing of making new feature branches constantly you will want to tear your hair out within a day. The main benefit of central server based VCs like these is the ability to acquire an exclusive write lock on files, (some call this "checking out" the file but that's confusing) so if you're loving around with some impossible-to-merge binary file you can ensure that nobody else touches it and you won't see merge conflict hell. For example in game dev Unreal Engine stores a lot of code in binary "blueprint" files. if the editor's version control integration is hooked up to an SVN or Perforce server, the editor will prompt you whenever you modify a blueprint / have uncommitted changes to lock it in the VC. Using git for this is extremely painful since you won't know that two people are touching the same file until you hit an inevitable conflict, and since the merge tools for blueprints are nonexistent one dev or the other is going to have to re-make all their changes. RPATDO_LAMD fucked around with this message at 02:06 on Oct 12, 2023 |
# ¿ Oct 12, 2023 01:56 |