我在Linux上使用git(與git-svn),同事在windows上使用svn。git svn windows linux whitespace問題
很多次,git報告空白問題。事實上,由於這些問題而無法提交線性歷史記錄,並造成合並衝突。
在windows和linux上配置svn/git和git-svn的最簡單方法是什麼,以便現在有空白問題?
以下是報告的合併衝突,在一個線性的歷史上主:
error: patch failed: frontend/templates/frontend/base.html:38
error: frontend/templates/frontend/base.html: patch does not apply
error: patch failed: frontend/templates/frontend/footer.html:1
error: frontend/templates/frontend/footer.html: patch does not apply
error: patch failed: frontend/templates/frontend/index.html:1
error: frontend/templates/frontend/index.html: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:15: trailing whitespace.
<stdin>:20: trailing whitespace.
<a href="{% url frontend_index %}">
<stdin>:22: trailing whitespace.
</a>
<stdin>:24: trailing whitespace.
<span class="companyname">
<stdin>:25: trailing whitespace.
<a href="{% url frontend_index %}">
warning: squelched 74 whitespace errors
warning: 79 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging frontend/templates/frontend/base.html
CONFLICT (content): Merge conflict in frontend/templates/frontend/base.html
Auto-merging frontend/templates/frontend/index.html
CONFLICT (content): Merge conflict in frontend/templates/frontend/index.html
Failed to merge in the changes.
Patch failed at 0001 template changes
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".
如何解決這個問題的空白?