You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by Apache Wiki <wi...@apache.org> on 2011/10/06 18:43:15 UTC
[Subversion Wiki] Trivial Update of "SupportedMergeScenarios" by JulianFoad
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=2&rev2=3
+ ''Design notes, plans and ideas by Julian Foad''
+
+ ----
= What Merges Does Svn’s Merge Tracking Support? =
We need to be able to say, “If you do all your merging like <this>, it will work like you expect.” So what is <this>? What are the supported scenarios, limitations and rules, and what can the user expect within and outside those scenarios?