Home/ Questions/Q 738523
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-14T07:50:47+00:00

I keep hearing that branching in git is so much easier than in SVN,

  • 0

I keep hearing that branching in git is so much easier than in SVN, because it’s easier to merge the branch back to trunk/master. I’ve read some tutorials, but they only covered basic merge conflicts (“Alice changed line 8 of code.cpp and at the same time Bob changed line 8 of code.cpp…”) and there are no differences between SVN and all other distributed source control systems.

Can you give me the examples of changes in branch that would cause troubles in SVN repository, but would be handled gracefully by git?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    I finally had some time to tinker with branches/merging with git and svn and found the case that kills svn but works perfectly with git:

    Let’s say the project consists of those files:

    /main.cpp
/sub1/sub1.cpp
/sub1/sub1.h
    1. Create branch
    2. In trunk, move sub1.* to root directory, delete sub1 subdirectory.
    3. In branch make some changes in /sub1/sub1.cpp
    4. In trunk make some changes in /sub1.cpp
    5. Merge branch and trunk.

    SVN loses all changes made in branch in point 3, similar changes in git are perfectly merged. That’s enough for me to reject SVN as version control system for any project that requires branching.

    • 0