Re: Choosing svn or git for small scale projects?

Mon, 24 May 2010 15:02:31 -0500, /Peng Yu/:

> Does svn offer all the capability that gits offer in terms of
> branching and merging (ignoring performance issues)?

<http://stackoverflow.com/questions/2475831/merging-hg-git-vs-svn/2477089#2477089>:

> ... from the release notes for Subversion 1.5: Merge tracking
> (foundational) it looks like there are the following differences from
> how merge tracking work in full-DAG version control systems like Git
> or Mercurial.
>
> * Merging trunk to branch is different from merging branch to
> trunk: for some reason merging trunk to branch requires --reintegrate
> option to svn merge.
>
> In distributed version control systems like Git or Mercurial
> there is no technical difference between trunk and branch: all
> branches are created equal (there might be social difference, though).
> Merging in either direction is done the same way.
> (...)

-- 
Stanimir