Using git-svn (or similar) just to help out with svn merge?

Posted by inger on Stack Overflow See other posts from Stack Overflow or by inger
Published on 2010-05-31T20:31:12Z Indexed on 2010/05/31 20:33 UTC
Read the original article Hit count: 144

Filed under:
|
|
|
|

Some complex subversion merges are coming up in my project: big branches that have been apart for a long time. Svn gives too many conflicts.

Would it be any good to use git-svn just for the benefit of making the merge more manageable? (perhaps due to its powerful content model)

Can you recommend other alternatives (eg. svk) to lessen the merge pain? Thanks in advance.

© Stack Overflow or respective owner

Related posts about svn

Related posts about merge