4 ms·
Odd, I found branching and merging so much easier in SVN. Git doesn't even technically have branches, just pointers to commits which can easily get mixed up, g
by Falkon1313 4y ago
Odd, I found branching and merging so much easier in SVN.
Git doesn't even technically have branches, just pointers to commits which can easily get mixed up, go headless and fail out in ways that just never happened in SVN.
And rebasing a branch with several commits can be a nightmare since you have to re-merge almost (but not exactly) the same code over and over again at whatever state it was in at some time in the past when some previous commit happened - unless you abort out and squash first. In SVN, you just merged the whole branch once and when both were in their final current state.
Of course, git's a lot more powerful, but with that comes complexity. SVN branching and merging was a snap comparatively.
- kevin_thibedeau 4y agoSVN will frequently insist that merge conflicts exist where there shouldn't be any if trees have been modified by deleting or moving directories. This is so pervasive that organizations will avoid doing merges because of the manual fixups you have to do on long lived branches. There's metadata now for tracking branch history but older versions couldn't figure out that two branches in a merge had a common ancestor. A puzzling thing to omit from a VCS.
- COMMENT___ 4y agoAFAIK, conflict resolution in Subversion is being improved: * https://subversion.apache.org/docs/release-notes/1.10.html#conflict-resolver https://subversion.apache.org/docs/release-notes/1.10.html#c... * https://subversion.apache.org/docs/release-notes/1.11.html#conflict-resolver https://subversion.apache.org/docs/release-notes/1.11.html#c...
- Izkata 4y ago> Git doesn't even technically have branches, just pointers to commits which can easily get mixed up, go headless and fail out in ways that just never happened in SVN. I mean, if that's a reason to say git doesn't technically have branches, then neither does svn. It has subdirectories that you can make copies of at any level, and copy commits between them at any level, such that you can make an amazing repo-within-a-repo mess not possible in git.