我正在试验git-svn
,并试图想出一个相对不容易出错的工作流程。我认为以下应该工作,并且非常简单,但我见过people using far more complicated workflows,所以我想看看为什么。这个git-svn工作流程是否工作?
(master) $ git svn init <path>
(master) $ git svn fetch
(master) $ git svn rebase
(master) $ git checkout -b topic-branch
(topic-branch) $ # HACK HACK COMMIT HACK HACK HACK COMMIT HACK COMMIT
(topic-branch) $ git checkout master
(master) $ git merge topic-branch
- 这是一个快进合并,所以没有合并提交(master) $ git svn rebase
(master) $ # fix conflicts
(master) $ git svn dcommit
GOTO 4
相关:http://stackoverflow.com/questions/1129688/git-svn-workflow-feature-branches-and-merge – cregox 2011-02-14 20:16:15