从一个重新分支的分支中提出一个好主意吗?

时间:2011-07-19 13:15:03

标签: git-svn rebase dcommit

考虑以下布局:

git                 |      svn
-----------------------------------
master              |  trunk
local_experimental  |  experimental

以下命令列表是否合理:

git checkout local_experimental
#hack hack hack
#commit changes to experimental svn branch
git svn dcommit experimental

#update the git repository from svn
git checkout master
git svn rebase

git checkout local_experimental
#how will svn handle the two following commands?

#rebase the experimental branch on master to get newest changes
git rebase master
git svn dcommit

0 个答案:

没有答案