document.write('<link rel="stylesheet" href="http://gist.github.com/stylesheets/gist/embed.css"/>')





document.write('<div id=\"gist-155455\" class=\"gist\">\n  \n  \n    \n            \n\n      <div class=\"gist-file\">\n        <div class=\"gist-data gist-syntax\">\n          \n          \n          \n            <div class=\"gist-highlight\"><pre><div class=\"line\" id=\"LC1\"><span class=\"c\"># &gt;&gt; First workflow<\/span><\/div><div class=\"line\" id=\"LC2\">git svn clone &lt;svn_repo&gt;<\/div><div class=\"line\" id=\"LC3\">&nbsp;<\/div><div class=\"line\" id=\"LC4\">git checkout -b featureZ<\/div><div class=\"line\" id=\"LC5\"><span class=\"c\"># hack hack hack<\/span><\/div><div class=\"line\" id=\"LC6\">&nbsp;<\/div><div class=\"line\" id=\"LC7\">git commit -a<\/div><div class=\"line\" id=\"LC8\">git svn rebase<\/div><div class=\"line\" id=\"LC9\">&nbsp;<\/div><div class=\"line\" id=\"LC10\">git svn dcommit   <span class=\"c\"># you can add -e to enter new <\/span><\/div><div class=\"line\" id=\"LC11\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class=\"c\"># commit message for SVN<\/span><\/div><div class=\"line\" id=\"LC12\">&nbsp;<\/div><div class=\"line\" id=\"LC13\"><span class=\"c\"># ---------------------------<\/span><\/div><div class=\"line\" id=\"LC14\">&nbsp;<\/div><div class=\"line\" id=\"LC15\"><span class=\"c\"># &gt;&gt; Second workflow (more ideal)<\/span><\/div><div class=\"line\" id=\"LC16\">git svn clone &lt;svn_repo&gt;<\/div><div class=\"line\" id=\"LC17\">&nbsp;<\/div><div class=\"line\" id=\"LC18\">git checkout -b featureZ<\/div><div class=\"line\" id=\"LC19\"><span class=\"c\"># hack hack hack<\/span><\/div><div class=\"line\" id=\"LC20\">&nbsp;<\/div><div class=\"line\" id=\"LC21\">git commit -a<\/div><div class=\"line\" id=\"LC22\">git checkout master<\/div><div class=\"line\" id=\"LC23\">git merge featureZ <span class=\"c\"># alternatively you an do git merge --squash featureZ<\/span><\/div><div class=\"line\" id=\"LC24\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class=\"c\"># to make all commits made into a single SVN commit <\/span><\/div><div class=\"line\" id=\"LC25\">&nbsp;<\/div><div class=\"line\" id=\"LC26\">git svn dcommit    <span class=\"c\"># you can add -e to enter new <\/span><\/div><div class=\"line\" id=\"LC27\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class=\"c\"># commit message for SVN<\/span><\/div><\/pre><\/div>\n          \n        <\/div>\n\n        <div class=\"gist-meta\">\n          <a href=\"http://gist.github.com/raw/155455/72734e799bdad1345e4bbb6c6e494afa996f99bb/Git%20SVN%20workflow.sh\" style=\"float:right;\">view raw<\/a>\n          <a href=\"http://gist.github.com/155455#file_git svn workflow.sh\" style=\"float:right;margin-right:10px;color:#666\">Git SVN workflow.sh<\/a>\n          <a href=\"http://gist.github.com/155455\">This Gist<\/a> brought to you by <a href=\"http://github.com\">GitHub<\/a>.\n        <\/div>\n      <\/div>\n    \n  \n<\/div>\n')
