我想重新綁定一個分支,git因爲試圖執行一些失敗的合併操作而氾濫。我該如何讓git來阻止它?由於空白錯誤git rebase失敗
# git rebase -f --onto master~2 master~ master
First, rewinding head to replay your work on top of it...
Applying: r1002 - CS 1.0.23
Using index info to reconstruct a base tree...
M about.html
<stdin>:68: trailing whitespace.
<stdin>:115: trailing whitespace.
<stdin>:201: trailing whitespace.
<stdin>:2369: trailing whitespace.
<stdin>:2385: trailing whitespace.
warning: squelched 2305 whitespace errors
warning: 2310 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging about.html
CONFLICT (content): Merge conflict in about.html
Failed to merge in the changes.
Patch failed at 0001 r1002 - 1002
The copy of the patch that failed is found in:
/local/melder/tmp/test/.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".
正如你可以看到有2000+空白的錯誤,不是容易用手合併。
編輯:以側步這個現在不合並我所做的:
# git add -A
# git rebase --continue
編輯:請不要介意這是一個愚蠢的想法。
嗯......你說得對,那不好。我嘗試使用rebase -X他們的策略,並且工作。事情是我試圖自動化這個rebasing過程。回購中應該沒有真正的衝突,我相信空白錯誤是由unix/windows移動造成的。如果可能的話,我想回避一下。 – melder