merge-strategies.txt: update wording for the resolve strategy
It is probably helpful to cover the default merge strategy first, so move the text for the resolve strategy to later in the document. Further, the wording for "resolve" claimed that it was "considered generally safe and fast", which might imply in some readers minds that the same is not true of other strategies. Rather than adding this text to all the strategies, just remove it from this one. Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 4, 2021 at 23:50 UTC
510415ecc9d6ff4a99991dc1b70a1ac50818a539
1 file changed
+6
-7
Documentation/merge-strategies.txt
+6
-7
@@ -6,13 +6,6 @@ backend 'merge strategies' to be chosen with `-s` option. Some strategies
6
can also take their own options, which can be passed by giving `-X<option>`
7
arguments to `git merge` and/or `git pull`.
8
9
-resolve::
10
- This can only resolve two heads (i.e. the current branch
11
- and another branch you pulled from) using a 3-way merge
12
- algorithm. It tries to carefully detect criss-cross
13
- merge ambiguities and is considered generally safe and
14
- fast.
15
-
9
recursive::
10
This can only resolve two heads using a 3-way merge
11
algorithm. When there is more than one common
@@ -106,6 +99,12 @@ subtree[=<path>];;
99
is prefixed (or stripped from the beginning) to make the shape of
100
two trees to match.
101
102
+resolve::
103
+ This can only resolve two heads (i.e. the current branch
104
+ and another branch you pulled from) using a 3-way merge
105
+ algorithm. It tries to carefully detect criss-cross
106
+ merge ambiguities. It does not handle renames.
107
+
108
octopus::
109
This resolves cases with more than two heads, but refuses to do
110
a complex merge that needs manual resolution. It is