这是我第一次尝试了解 git rebase 是如何工作的。我在新分支上做了很多更改,然后我尝试git rebase
了,结果我得到了下一个输出:
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: new features done
/sandbox/.git/rebase-apply/patch:2825: trailing whitespace.
var upl_div = document.getElementById('upload_form');
/sandbox/.git/rebase-apply/patch:2826: trailing whitespace.
var crt_div = document.getElementById('create_form');
/sandbox/.git/rebase-apply/patch:2827: trailing whitespace.
var appl_div = document.getElementById('create_letter');
warning: squelched 309 whitespace errors
warning: 314 lines add whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:2825: trailing whitespace.
var upl_div = document.getElementById('upload_form');
<stdin>:2826: trailing whitespace.
var crt_div = document.getElementById('create_form');
<stdin>:2827: trailing whitespace.
var appl_div = document.getElementById('create_letter');
warning: squelched 310 whitespace errors
warning: 309 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging lib/functions_common.inc
Auto-merging .htaccess
Applying: new features done
而且我不明白它是否成功制作?它被重新定位或合并?发生了什么?我怎么能看到这些警告?