diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-26 08:39:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-26 08:39:38 +0000 |
| commit | 1de7572eb1aa483cc2aaca1db274928ffc6830f0 (patch) | |
| tree | ac708c90ee1a4a4765a9e852319760583d609fc6 /merge-strategies.txt | |
| parent | 625716ad62c5c0b2c57c90079944a7f6b914bb09 (diff) | |
| download | git-htmldocs-1de7572eb1aa483cc2aaca1db274928ffc6830f0.tar.gz | |
Autogenerated HTML docs for v1.6.2.1-389-geed1
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index 1276f858a..4365b7e84 100644 --- a/merge-strategies.txt +++ b/merge-strategies.txt @@ -3,15 +3,15 @@ MERGE STRATEGIES resolve:: This can only resolve two heads (i.e. the current branch - and another branch you pulled from) using 3-way merge + 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 3-way merge - algorithm. When there are more than one common - ancestors that can be used for 3-way merge, it creates a + This can only resolve two heads using a 3-way merge + algorithm. When there is more than one common + ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without @@ -22,11 +22,11 @@ recursive:: pulling or merging one branch. octopus:: - This resolves more than two-head case, but refuses to do - complex merge that needs manual resolution. It is + This resolves cases with more than two heads, but refuses to do + a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when - pulling or merging more than one branches. + pulling or merging more than one branch. ours:: This resolves any number of heads, but the result of the |