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=8&rev2=9 This document is concerned primarily with the kinds of merges in which Subversion’s merge ''tracking'' takes effect -- that is the automatic (''catch-up'' and ''reintegrate) ''merges. === Identifying Logical Changes vs. Commits === + ==== and Why Conflict Resolution is Part of Merging ==== To discuss the nuances of what exactly is tracked in Merge Tracking, we need to think about the difference between a raw change in the repository (a ''commit'') and a concept that we can call a ''logical change''. This distinction is ''not'' implemented in Subversion 1.6. When I commit a change that’s not a merge, we can regard that as introducing a new ''logical change'' into my project, on a given branch. But when I merge that change to another branch and commit the result, that is not creating a new logical change, rather it is the physical representation in that target branch of the same logical change. (In simple cases the physical change is often “the same” but in general it is different, because it is adapted automatically or through ''conflict resolution'' to suit that target branch, or because in the target branch it is combined with other logical changes that are merged at the same time into a single commit, or both.)
