3 ms·

It is not just about being harder to understand. I would say it is partially self contradicting. First, it teaches you to unlearn the centralized vc. But i am y

It is not just about being harder to understand. I would say it is partially self contradicting. First, it teaches you to unlearn the centralized vc. But i am yet to see a commercial git repo which doesn't maintain a central branch. The amount of confusion it puts an average developer into, specially if they are coming from subversion background does eat a lot of energy. I bet the person making the decision to switch to git, didn't foresee that (i didn't). Otherwise, you always would question if it is worth the trouble maintaining the project. Having said that, although there are countless benefits of git, but the one that truly makes it worthwhile in my scenario was the difference in merging capability. SVN needs to go a really long way even to be competitive there.

ShirtlessRod 13y ago
I work in an SVN shop, so I haven't had much experience with git thus far. What are the advantages that git has over SVN in merging? I've never had any problems merging while using SVN.
- fayyazkl 13y ago
  Though it might be a lot to write, but just a small case as an example. If you have two different variables initialized on same line number in svn, it is possible that in merging two different branches (not revisions), svn quietly puts them BOTH in the code which doesn't even produce a compile time error and it takes ages to find out the actual cause. I have actually been through this since we used to have a dpi product whose separately developed branches for different target platforms needed to be merged and it was all svn. At best svn would give you manual conflicts to resolve. With git, the number of conflicts to be resolved by hand is far less. For a general list, take a look at http://stackoverflow.com/questions/2471606/how-and-or-why-is-merging-in-git-better-than-in-svn http://stackoverflow.com/questions/2471606/how-and-or-why-is...

ShirtlessRod 13y ago

I work in an SVN shop, so I haven't had much experience with git thus far. What are the advantages that git has over SVN in merging? I've never had any problems merging while using SVN.

fayyazkl 13y ago
Though it might be a lot to write, but just a small case as an example. If you have two different variables initialized on same line number in svn, it is possible that in merging two different branches (not revisions), svn quietly puts them BOTH in the code which doesn't even produce a compile time error and it takes ages to find out the actual cause. I have actually been through this since we used to have a dpi product whose separately developed branches for different target platforms needed to be merged and it was all svn. At best svn would give you manual conflicts to resolve. With git, the number of conflicts to be resolved by hand is far less. For a general list, take a look at http://stackoverflow.com/questions/2471606/how-and-or-why-is-merging-in-git-better-than-in-svn http://stackoverflow.com/questions/2471606/how-and-or-why-is...