我有一个 SVN 分支的问题。我用git checkout -t -b stable svn/stable
. 然后我做了一个合并git rebase master
。之后,我尝试将合并更改提交到远程分支git svn dcommit
但现在看来,Git 将更改推送到主干而不是分支:(
并git status
告诉我:
# On branch stable
# Your branch and 'svn/stable' have diverged,
# and have 218 and 52 different commit(s) each, respectively.
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
...
有人知道我做错了什么以及如何做对吗?