我正在試驗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