{"thread":{"id":"23952","subject":"Merging with git-svn - how about this?","startedAt":"2010-05-31T15:34:12Z","lastAt":"2010-05-31T15:34:12Z","messageCount":1,"participants":["Andrew Sayers"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"142614","messageId":"4C03D6F4.2010204@pileofstuff.org","threadId":"23952","inReplyTo":null,"subject":"Merging with git-svn - how about this?","fromName":"Andrew Sayers","fromEmail":"andrew-git@pileofstuff.org","sentAt":"2010-05-31T15:34:12Z","receivedAt":"2010-05-31T15:34:12Z","isPatch":false,"sender":{"key":"andrew-git@pileofstuff.org","avatar":null},"body":"I'm writing up a wiki page based on the \"best way to make my company\nmigrate to Git\" thread from earlier this month, and I'd like to\nrecommend something for merging (beyond the standard \"don't do it\").\nHere's what I'm planning to write - I'd appreciate any suggestions or\nadvice people have:\n\nTo merge from $from_branch to $to_branch with git-svn, do:\n\ngit checkout $to_branch@{0}\ngit merge --no-ff $from_branch\n# Fix any merge conflicts, `git add`, `git commit` etc.\ngit checkout $to_branch\ngit cherry-pick -m 1 HEAD@{1}\n\n\t- Andrew\n"}]}