diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 15:54:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 15:54:21 -0800 |
| commit | cf77b0414a44eadfcd0c74dfcae739427b7d2cce (patch) | |
| tree | 1519c182edb5f1d3603ae6d752dcb9106e36f117 /git-pull.html | |
| parent | 4c8f2d99229331de853716af53a6a0901b4b0d68 (diff) | |
| download | git-htmldocs-cf77b0414a44eadfcd0c74dfcae739427b7d2cce.tar.gz | |
Autogenerated HTML docs for v1.8.5.2-192-g7794
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/git-pull.html b/git-pull.html index d0e108476..f534adeef 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1762,6 +1762,13 @@ subtree </p>
</dd>
</dl></div>
+<div class="paragraph"><p>With the strategies that use 3-way merge (including the default, <em>recursive</em>),
+if a change is made on both branches, but later reverted on one of the
+branches, that change will be present in the merged result; some people find
+this behavior confusing. It occurs because only the heads and the merge base
+are considered when performing a merge, not the individual commits. The merge
+algorithm therefore considers the reverted change as no change at all, and
+substitutes the changed version instead.</p></div>
</div>
</div>
<div class="sect1">
|