]>
Commit | Line | Data |
---|---|---|
bb73d73c JL |
1 | MERGE STRATEGIES |
2 | ---------------- | |
3 | ||
3c3e6f56 | 4 | The merge mechanism (`git merge` and `git pull` commands) allows the |
566c5111 JH |
5 | 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>` | |
3c3e6f56 | 7 | arguments to `git merge` and/or `git pull`. |
566c5111 | 8 | |
bb73d73c JL |
9 | resolve:: |
10 | This can only resolve two heads (i.e. the current branch | |
4fa535a1 | 11 | and another branch you pulled from) using a 3-way merge |
bb73d73c JL |
12 | algorithm. It tries to carefully detect criss-cross |
13 | merge ambiguities and is considered generally safe and | |
9688a882 | 14 | fast. |
bb73d73c JL |
15 | |
16 | recursive:: | |
4fa535a1 WC |
17 | This can only resolve two heads using a 3-way merge |
18 | algorithm. When there is more than one common | |
19 | ancestor that can be used for 3-way merge, it creates a | |
9688a882 | 20 | merged tree of the common ancestors and uses that as |
bb73d73c JL |
21 | the reference tree for the 3-way merge. This has been |
22 | reported to result in fewer merge conflicts without | |
13f72a1d | 23 | causing mismerges by tests done on actual merge commits |
bb73d73c JL |
24 | taken from Linux 2.6 kernel development history. |
25 | Additionally this can detect and handle merges involving | |
9688a882 JH |
26 | renames. This is the default merge strategy when |
27 | pulling or merging one branch. | |
566c5111 JH |
28 | + |
29 | The 'recursive' strategy can take the following options: | |
30 | ||
31 | ours;; | |
32 | This option forces conflicting hunks to be auto-resolved cleanly by | |
33 | favoring 'our' version. Changes from the other tree that do not | |
34 | conflict with our side are reflected to the merge result. | |
a944af1d | 35 | For a binary file, the entire contents are taken from our side. |
566c5111 JH |
36 | + |
37 | This should not be confused with the 'ours' merge strategy, which does not | |
38 | even look at what the other tree contains at all. It discards everything | |
39 | the other tree did, declaring 'our' history contains all that happened in it. | |
40 | ||
41 | theirs;; | |
c25d98b2 | 42 | This is the opposite of 'ours'; note that, unlike 'ours', there is |
bd9958c3 | 43 | no 'theirs' merge strategy to confuse this merge option with. |
566c5111 | 44 | |
58a1ece4 JF |
45 | patience;; |
46 | With this option, 'merge-recursive' spends a little extra time | |
47 | to avoid mismerges that sometimes occur due to unimportant | |
48 | matching lines (e.g., braces from distinct functions). Use | |
49 | this when the branches to be merged have diverged wildly. | |
50 | See also linkgit:git-diff[1] `--patience`. | |
51 | ||
4db4f0fb JK |
52 | diff-algorithm=[patience|minimal|histogram|myers];; |
53 | Tells 'merge-recursive' to use a different diff algorithm, which | |
54 | can help avoid mismerges that occur due to unimportant matching | |
55 | lines (such as braces from distinct functions). See also | |
56 | linkgit:git-diff[1] `--diff-algorithm`. | |
57 | ||
4e5dd044 JF |
58 | ignore-space-change;; |
59 | ignore-all-space;; | |
60 | ignore-space-at-eol;; | |
61 | Treats lines with the indicated type of whitespace change as | |
62 | unchanged for the sake of a three-way merge. Whitespace | |
63 | changes mixed with other changes to a line are not ignored. | |
64 | See also linkgit:git-diff[1] `-b`, `-w`, and | |
65 | `--ignore-space-at-eol`. | |
66 | + | |
67 | * If 'their' version only introduces whitespace changes to a line, | |
68 | 'our' version is used; | |
69 | * If 'our' version introduces whitespace changes but 'their' | |
70 | version includes a substantial change, 'their' version is used; | |
71 | * Otherwise, the merge proceeds in the usual way. | |
72 | ||
7610fa57 JN |
73 | renormalize;; |
74 | This runs a virtual check-out and check-in of all three stages | |
75 | of a file when resolving a three-way merge. This option is | |
76 | meant to be used when merging branches with different clean | |
77 | filters or end-of-line normalization rules. See "Merging | |
78 | branches with differing checkin/checkout attributes" in | |
79 | linkgit:gitattributes[5] for details. | |
80 | ||
81 | no-renormalize;; | |
82 | Disables the `renormalize` option. This overrides the | |
83 | `merge.renormalize` configuration variable. | |
84 | ||
d2b11eca FGA |
85 | no-renames;; |
86 | Turn off rename detection. | |
87 | See also linkgit:git-diff[1] `--no-renames`. | |
88 | ||
1b47ad16 | 89 | find-renames[=<n>];; |
83837ec0 FGA |
90 | Turn on rename detection, optionally setting the similarity |
91 | threshold. This is the default. | |
1b47ad16 FGA |
92 | See also linkgit:git-diff[1] `--find-renames`. |
93 | ||
10ae7526 | 94 | rename-threshold=<n>;; |
1b47ad16 | 95 | Deprecated synonym for `find-renames=<n>`. |
10ae7526 | 96 | |
62b4698e | 97 | subtree[=<path>];; |
566c5111 JH |
98 | This option is a more advanced form of 'subtree' strategy, where |
99 | the strategy makes a guess on how two trees must be shifted to | |
100 | match with each other when merging. Instead, the specified path | |
101 | is prefixed (or stripped from the beginning) to make the shape of | |
102 | two trees to match. | |
bb73d73c JL |
103 | |
104 | octopus:: | |
4fa535a1 WC |
105 | This resolves cases with more than two heads, but refuses to do |
106 | a complex merge that needs manual resolution. It is | |
bb73d73c JL |
107 | primarily meant to be used for bundling topic branch |
108 | heads together. This is the default merge strategy when | |
4fa535a1 | 109 | pulling or merging more than one branch. |
bb73d73c JL |
110 | |
111 | ours:: | |
d4cbaa12 TR |
112 | This resolves any number of heads, but the resulting tree of the |
113 | merge is always that of the current branch head, effectively | |
114 | ignoring all changes from all other branches. It is meant to | |
bb73d73c | 115 | be used to supersede old development history of side |
566c5111 JH |
116 | branches. Note that this is different from the -Xours option to |
117 | the 'recursive' merge strategy. | |
02b00e16 MV |
118 | |
119 | subtree:: | |
120 | This is a modified recursive strategy. When merging trees A and | |
121 | B, if B corresponds to a subtree of A, B is first adjusted to | |
122 | match the tree structure of A, instead of reading the trees at | |
123 | the same level. This adjustment is also done to the common | |
124 | ancestor tree. | |
c5665000 | 125 | |
126 | With the strategies that use 3-way merge (including the default, 'recursive'), | |
127 | if a change is made on both branches, but later reverted on one of the | |
128 | branches, that change will be present in the merged result; some people find | |
129 | this behavior confusing. It occurs because only the heads and the merge base | |
130 | are considered when performing a merge, not the individual commits. The merge | |
131 | algorithm therefore considers the reverted change as no change at all, and | |
132 | substitutes the changed version instead. |