git version 1.7.1
svn, version 1.6.12
Ubuntu 10.10
我之前使用过git和svn，但从未将它们结合使用过。我有一个git仓库，需要将其转移到subversion仓库中。因此，我一直在使用git-svn。大部分时间都能正常工作，但是我发现自己陷入了一个死循环。
这个项目只有我在开发。
我对我的分支进行了一些更改，然后将它们暂存：
git stage gateway.c
然后在本地将它们提交到git：
git commit m"Made some changes"
然后我想将它们提交到Subversion。获取最新更新：
git svn rebase
然后我收到以下消息：
It seems that I cannot create a rebase-apply directory, and
I wonder if you are in the middle of patch application or another
rebase. If that is not the case, please
rm -fr /home/joe/projects/gateway/.git/rebase-apply
and run me again. I am stopping in case you still have something
valuable there.
rebase refs/remotes/trunk: command returned error: 1
I then doing the following:
rm -fr /home/joe/projects/gateway/.git/rebase-apply
然后我再次进行变基：
git svn rebase
这是需要翻译的内容：
信息如下：
First, rewinding head to replay your work on top of it...
Applying: Issue with getting the port from the user context.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging driver.c
Auto-merging gateway.c
CONFLICT (content): Merge conflict in gateway.c
Failed to merge in the changes.
Patch failed at 0001 Issue with getting the port from the user context.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
rebase refs/remotes/trunk: command returned error: 1
这让我进入了一个叫做“branch”的分支，这个分支是什么，有什么用途？
*(no branch)
我解决了那个分支的冲突。然后我切换到我的play_video分支。我尝试做另一个:
svn git dcommit
我又开始打圆场了。
在我把头拔光之前，有人能给我提供一些建议吗？
非常感谢任何建议。