This project is read-only.

Prefer Full Merges to “Cherry-Pick” Merges

- J.D. Meier, Jason Taylor, Alex Mackman, Prashant Bansode

Rather than picking individual changes to merge between branches (a “cherry-pick” merge), choose to merge the entire branch at once. It can be convenient to select individual changes in a branch to merge with another branch. However, if a cherry-picked changeset falls in the middle of a future merge range, that changeset will be re-merged, potentially resulting in additional merge conflicts.

This is especially true for /discard merges run from the command line. The discarded changeset can be picked up if it falls in the middle of a future merge range.

Additional Resources

Last edited Jul 26, 2007 at 10:19 AM by prashantbansode, version 3

Comments

RichardBerg Apr 11, 2007 at 1:36 PM 
Note: this page is likely to cause severe confusion between "tree merge" and "content merge". Allow me to annotate:

----
Rather than picking individual changes to [tree] merge between branches (a cherry-pick [tree] merge), choose to [tree] merge the entire branch at once. It can be convenient to select individual changes in a branch to [tree] merge with another branch. However, if a cherry-picked changeset falls in the middle of a future [tree] merge range, that changeset['s contents, iff the change was an edit] will be re-[content]-merged, potentially resulting in additional [content] merge conflicts.

This is especially true for /discard [tree] merges run from the command line. The discarded changeset [contents] can be picked up if it falls in the middle of a future [tree] merge range.