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"
然后我想让他们颠覆。获取最新更新:
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
这让我进入了一个名为的分支,这个分支是什么以及它的用途是什么?:
*(no branch)
然后我解决该分支的冲突。然后我检查我的 play_video 分支。我尝试再做一个:
svn git dcommit
结果我又兜圈子了。
在我开始拔头发之前,有人可以给我一些建议吗?
非常感谢您的任何建议,