diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:39 -0700 |
| commit | 510415ecc9d6ff4a99991dc1b70a1ac50818a539 (patch) | |
| tree | 4deb454f75ead4f0b079b5dc45e5094949ca6e45 | |
| parent | Documentation: edit awkward references to `git merge-recursive` (diff) | |
| download | tgif-510415ecc9d6ff4a99991dc1b70a1ac50818a539.tar.xz | |
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>
| -rw-r--r-- | Documentation/merge-strategies.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 5d707e952a..f100fad1e4 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -6,13 +6,6 @@ backend 'merge strategies' to be chosen with `-s` option. Some strategies can also take their own options, which can be passed by giving `-X<option>` arguments to `git merge` and/or `git pull`. -resolve:: - This can only resolve two heads (i.e. the current branch - and another branch you pulled from) using a 3-way merge - algorithm. It tries to carefully detect criss-cross - merge ambiguities and is considered generally safe and - fast. - recursive:: This can only resolve two heads using a 3-way merge algorithm. When there is more than one common @@ -106,6 +99,12 @@ subtree[=<path>];; is prefixed (or stripped from the beginning) to make the shape of two trees to match. +resolve:: + This can only resolve two heads (i.e. the current branch + and another branch you pulled from) using a 3-way merge + algorithm. It tries to carefully detect criss-cross + merge ambiguities. It does not handle renames. + octopus:: This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is |