102 | | listed in the next | non *unstable* base to | |
102 | | listed in the next | non *unstable* base to | |
103 | | column. It is possible | solve the problem. | |
103 | | column. It is possible | solve the problem. | |
104 | | for *unstable* | | |
104 | | for *unstable* | | |
105 | | changeset to combine | (possible alternative name: | |
105 | | changeset to combine | (possible alternative name: | |
106 | | multiple issue at once. | precarious) | |
106 | | multiple issue at once. | precarious) | |
107 | | (a.k.a. divergent and | | |
107 | | (a.k.a. content-divergent| | |
108 | | orphan) +-----------------------------+ |
108 | | and orphan) +-----------------------------+ |
109 | | | | |
109 | | | | |
110 | | (possible alternative | **bumped** | |
110 | | (possible alternative | **bumped** | |
111 | | names: unsettled, | | |
111 | | names: unsettled, | | |
112 | | troublesome | *bumped* is a changeset | |
112 | | troublesome | *bumped* is a changeset | |
113 | | | that tries to be successor | |
113 | | | that tries to be successor | |
123 | | | (possible alternative names:| |
123 | | | (possible alternative names:| |
124 | | | mislead, naive, unaware, | |
124 | | | mislead, naive, unaware, | |
125 | | | mindless, disenchanting) | |
125 | | | mindless, disenchanting) | |
126 | | | | |
126 | | | | |
127 | | +-----------------------------+ |
127 | | +-----------------------------+ |
128 | | | **divergent** | |
128 | | | **content-divergent** | |
129 | | | | |
129 | | | | |
130 | | | *divergent* is changeset | |
130 | | | *content-divergent* is a | |
131 | | | that appears when multiple | |
131 | | | changeset that appears when | |
132 | | | changesets are successors | |
132 | | | multiple changesets are | |
133 | | | of the same predecessor. | |
133 | | | successors of the same | |
134 | | | | |
134 | | | predecessor. | |
135 | | | *divergent* are solved | |
135 | | | | |
136 | | | through a three ways merge | |
136 | | | *content-divergent* are | |
137 | | | between the two | |
137 | | | solved through a three way | |
138 | | | *divergent* , | |
138 | | | merge between the two | |
|
139 | | | *content-divergent* , | |
139 | | | using the last "obsolete- | |
140 | | | using the last "obsolete- | |
140 | | | -common-ancestor" as the | |
141 | | | -common-ancestor" as the | |
141 | | | base. | |
142 | | | base. | |
142 | | | | |
143 | | | | |
143 | | | (*splitting* is | |
144 | | | (*splitting* is | |