Git svn rebase:文件过期-尾随空格

我在使用git svn时遇到问题。我有一个repor，它主要由Windows用户使用，但我使用Linux

我已经对该回购协议进行了更改，但今天我是在git svn DCOMIT之后得到的：

Could not chdir to home directory /isource/home/pmalek: No such file or directory
        M       robot_tests/XXXXX-XXXXX_tests/testcases/03.01.test.tsv
        M       robot_tests/XXXXX-XXXXX_tests/testcases/XXXXXKeywords.tsv
        M       robot_tests/common_keywords/XXXXXKeywords.tsv

ERROR from SVN:
Transaction is out of date: File '/trunk/robot_tests/XXXXX-XXXXX_tests/testcases/XXXXXKeywords.tsv' is out of date
W: 1638177d0f033905043ff0fd9507e9fc30f39db6 and refs/remotes/git-svn differ, using rebase:
:040000 040000 c6f5f770f94b1b46310a4c20f09f2da3e2d1d806 9f378428c1211f60bcabd96f2c3b0e9794dbd90a M      robot_tests
First, rewinding head to replay your work on top of it...
Applying: Test | XXXXX TA tests refactored
Using index info to reconstruct a base tree...
M       robot_tests/XXXXX-XXXXX_tests/testcases/XXXXXKeywords.tsv
<stdin>:12: trailing whitespace.
${test_Filename} XXXXX_test.xml
<stdin>:14: trailing whitespace.
${configFilename}       xxxxtest.xml
<stdin>:18: trailing whitespace.
Topology file in XXXXX bin directory    [Documentation] file in XXXXX bin directory
<stdin>:19: trailing whitespace.
        [Timeout]       30 seconds
<stdin>:23: trailing whitespace.
        SSHLibrary.File Should Exist    ${XXXXXdirectory}/bin/${test_Filename}
warning: squelched 93 whitespace errors
warning: 98 lines add whitespace errors.
Falling back to patching base and 3-way merge...
/home/XXXXX/libexec/git-core/git-am: line 179: git-merge-recursive: command not found
Failed to merge in the changes.
Patch failed at 0001 Test | XXXXX TA tests refactored
The copy of the patch that failed is found in: 
   /home/xxxxx/_svn/trunk/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

rebase refs/remotes/git-svn: command returned error: 1

---

git svn dcommit

仅当您的git分支是超集（即比最新的svn版本更新）时才起作用。如果不是这样，则必须首先导入新的SVN提交。这是通过

git svn rebase

执行什么命令来获得输出的？@LarsNoschinski

git svn dcommit

-添加到问题中空白不应该是相关问题。我对缺少的

git merge recursive

感到困惑。

git merge recursive

有效吗？当我启动

git svn rebase

时，我得到了几乎相同的输出（缺少svn错误的顶部部分）。好的，这意味着这既不是空白的问题，也不是与svn直接相关的

git-svn-rebase

引入当前的svn版本，并尝试在这些版本的基础上重新设置提交的基础。在此过程中，会发生冲突，它试图通过merge recursive（似乎缺少）来解决冲突，但失败了。因此，您需要手动解决冲突。使用

gitmergetool

可能会有所帮助。如果您查找rebase和冲突，可能会找到更多提示。

git merge recursive用法：git merge recursive…---就在那里…：（问题在于合并操作本身（我的朋友在我将其放入回购协议之前提交了我的更改）
[core]
   autocrlf = true
   whitespace = cr-at-eol