| commit | d4cbaa12a774a97dfa9e99aad9188dc802469bb6 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Sun, 15 Nov 2009 18:25:30 +0000 (15 19:25 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 Nov 2009 20:26:08 +0000 (15 12:26 -0800) | ||
| tree | d8a46448db193f3c7c725a6df61b8e94426d260b | treesnapshot (tar.gz zip) |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 | commitdiff |
Documentation: clarify 'ours' merge strategy
Make it clear in the docs that the merge takes the tree of HEAD and
ignores everything in the other branches. This should hopefully clear
up confusion, usually caused by the user looking for a strategy that
resolves all conflict hunks in favour of HEAD (which is completely
different and currently not supported).
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Make it clear in the docs that the merge takes the tree of HEAD and
ignores everything in the other branches. This should hopefully clear
up confusion, usually caused by the user looking for a strategy that
resolves all conflict hunks in favour of HEAD (which is completely
different and currently not supported).
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-strategies.txt | diffblobblamehistory |