Comments on: More git-svn fun: working with svn branches http://www.ronniealleva.org/index.php/2009/09/16/more-git-svn-fun-working-with-svn-branches/ There are many like it but this one is mine Sun, 05 Sep 2010 07:29:31 +0000 http://wordpress.org/?v=2.9.2 hourly 1 By: Gergo http://www.ronniealleva.org/index.php/2009/09/16/more-git-svn-fun-working-with-svn-branches/comment-page-1/#comment-6442 Gergo Mon, 14 Jun 2010 23:45:19 +0000 http://www.ronniealleva.org/?p=50#comment-6442 > Hopefully this helps…someone. One person, at least. Two now, at least ;-) thanks indeed! Could you explain why a simple git-merge is not recommended here? My understanding is just the merge history won't be preserved (due to the SVN limitations), so some suggest rebasing instead (haven't seen cherry-picking yet, but I'm a newb). But if you don't care about re-merges(let's you this is a one-off task now) - would the normal git-merge break anything when dcommitted back to svn? > Hopefully this helps…someone. One person, at least.
Two now, at least ;-) thanks indeed!

Could you explain why a simple git-merge is not recommended here?
My understanding is just the merge history won’t be preserved (due to the SVN limitations), so some suggest rebasing instead (haven’t seen cherry-picking yet, but I’m a newb).

But if you don’t care about re-merges(let’s you this is a one-off task now) – would the normal git-merge break anything when dcommitted back to svn?

]]>