git rebase结果

Question

这是我第一次尝试了解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

我不明白它是不是已经成功制作了？它是重新建立的还是合并的？发生了什么事？我怎么才能看到这些警告呢？

Answer 1

当你做rebase时，git将接受一堆提交，并尝试应用每一个依次引入的更改。(换句话说，它就像git cherry-pick的一系列用法。)这些重新应用程序中的每一个都可以使用git的合并机制来尝试解决通过将更改重新应用于新的父应用程序而可能出现的任何冲突。

“尾随空格”警告告诉您，应用更改会在末尾添加一些带有空格的行。git对此很敏感(显然是从it can cause problems for patches sent by email开始)，它会在各种情况下警告你这类空格。