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=18&rev2=19 Comment: Tweak the disclaimer. - ''Design notes, plans and ideas.'' + ~-''Design notes, plans and ideas.'' - ''This is not part of the official documentation of Subversion. It is aimed at the developers of Subversion, and may not reflect reality or the project community's plans. For official documentation, see'' http://subversion.apache.org/docs/''.'' + ''This is not part of the official documentation of Subversion. It is aimed at the developers of Subversion, and may not reflect reality or the project community's plans. For official documentation, see'' http://subversion.apache.org/docs/ ''.''-~ ---- = What Merges Does Svn’s Merge Tracking Support? = @@ -159, +159 @@ Also, if this change is being merged into a target WC in which other changes have also being merged, and touches some of the same nodes, then similarly this change is also adapted (automatically and/or through manual conflict resolution) to combine with those other changes. ---- - ''This page was written initially by JulianFoad and may be edited by others.'' + ~-''This page was written initially by JulianFoad and may be edited by others.''-~
