News for hackers. Stuff that matters.

A comment on Moving from SVN to Git in 1,000 easy steps. Parent comment

Re:Moving from SVN to Git in 1,000 easy steps by jeltz on Friday December 02, 2011 @06:30PM (#3306233)
Agreed about conflicts. One of the things that surprised me the most with git, coming from subversion, was how much easier it was to merge code and how there were less conflicts and how they were often much easier to resolve.

I tried to do mostly branched development in subversion but gave up on that due to all conflicts.

[ Parent | on HN ]
Re:Moving from SVN to Git in 1,000 easy steps by InclinedPlane on Friday December 02, 2011 @06:54PM (#3306303)
One of the downsides of git (and mercurial and others) being evangelized so heavily as next generation distributed version control systems is that some of the more fundamental improvements get passed over. These are world-class version control systems, even discounting their dvcs capabilities. If you do a merge with git/hg vs svn or even perforce or TFS you'll get about as good an experience and a workflow as is possible.
[ Parent | on HN ]