Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "SupportedMergeScenarios" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SupportedMergeScenarios?action=diff&rev1=11&rev2=12 Comment: Add a footnote The information in this document is not intended to repeat the functional documentation of the “merge” command itself, but rather to explain the ways in which that command can be used effectively. === Merge Tracking vs. Merging === - Merging is a broad term. We’re talking here about here merging changes that have been made on one branch into another branch. The whole process of merging includes several steps which may be manual or automated: + Merging is a broad term. We’re talking here about here merging changes that have been made on one branch into another branch ([[#Note_1|1]]). The whole process of merging includes several steps which may be manual or automated: * selecting a source branch * identifying which changes to pull from the source branch @@ -143, +143 @@ 1. B → A. You can cherry-pick any individual revision or revision range from B that is not already recorded on A. 1. You should NOT cherry-pick a change from A to B or from B to A that is already recorded on the target branch. (Subversion attempts the merge but does not record it.) + ---- + == Notes == + === Note 1 === + Other possible kinds of merging include taking any arbitrary difference between two files or directories -- perhaps on different branches or without any branching history connecting them -- and merge that difference into some other file or directory (perhaps unrelated to either side of that diff). Merge tracking does not try to address such cases, and so we do not consider them here. +
