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>
Thomas Rast committed
Nov 15, 2009 at 19:25 UTC
d4cbaa12a774a97dfa9e99aad9188dc802469bb6
1 file changed
+3
-2
Documentation/merge-strategies.txt
+3
-2
@@ -29,8 +29,9 @@ octopus::
29
pulling or merging more than one branch.
30
31
ours::
32
- This resolves any number of heads, but the result of the
33
- merge is always the current branch head. It is meant to
32
+ This resolves any number of heads, but the resulting tree of the
33
+ merge is always that of the current branch head, effectively
34
+ ignoring all changes from all other branches. It is meant to
35
be used to supersede old development history of side
36
branches.
37