git-svn无法重新设置基准，因为文件仅存在于git存储库中，而不存在于svn中 [英] git-svn cannot rebase because of files that exist only in git repository, not in svn

问题描述

当我执行git svn rebase时，它告诉我它在甚至不在SVN信息库中的文件中都有一个CONFLICT(添加/添加)，我在最初的git克隆之后添加了它.当启动我最喜欢的合并工具meld时，我看到该文件的两个版本，一个版本比另一个版本新.因此，我通过对较新版本进行所有更改来解决合并冲突，并对文件执行"git add". Git状态不显示提交更改的阶段，而git rebase --continue表示: 没有变化-您忘记使用'git add'吗?

When I do a git svn rebase, it tells me that it had a CONFLICT (add/add) in a file that's not even in the SVN repository, I added it after my initial git clone. When I fire up meld, my favorite merge tool, I see two versions of the file, one more recent than the other. So I resolve the merge conflict by taking all the changes for the more recent version, and do a 'git add' on the file. Git status does not show the change staged for commit, and git rebase --continue says: No changes - did you forget to use 'git add'?

这是怎么回事?我做错了什么?为什么不合并?

What's going on? What have I done wrong? Why won't this merge?

推荐答案

只是您已将冲突解决到HEAD已经存在的状态.当您看到在解决了冲突并git add处理完文件后，您的git status是干净的或git rebase --continue告诉您没有任何更改时，继续使用git rebase --skip是安全的.

It's just that you've resolved the conflict to the state that HEAD was at already. When you see that after resolving the conflict and git adding the file your git status is clean or git rebase --continue tells you there are no changes, it's safe to just move on with git rebase --skip.

这篇关于git-svn无法重新设置基准，因为文件仅存在于git存储库中，而不存在于svn中的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！