Re:Confusing Git Terminology
by Kranar on Thursday November 02, 2023 @11:42PM
(#38124223)
It's true that it's been a decade since I used SVN so I could be misremebering, I just remember branching and merging being a much larger pain than in git.
[ Parent
| on HN ]
Branches were made by copying the directory tree, and svn doesn't have local commits so it always went straight to the server.
I think svn also originally didn't have merging, or at the very least it was such a bad experience svnmerge.py was created and really common to use. Even once it got good it was mostly the equivalent of using git cherry-pick to pull commits across branches, though it did get a special "reintegrate" mode for diffing a branch and applying that back to trunk (and I remember there being something about it being possible to accidentally undo commits if you weren't fully up to date when running it...?)
Re:Confusing Git Terminology
by mangodrunk on Friday November 03, 2023 @12:00AM
(#38124343)
I know what you mean, when git was gaining popularity I do remember people saying that branching being better/easier in git. I do think it was overstated back then and just not true. I haven’t used svn in years as well, but I think it was mostly due to the hype than any objective merit.