Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "JulianFoad" page has been changed by CMichaelPilato: http://wiki.apache.org/subversion/JulianFoad?action=diff&rev1=3&rev2=4 Comment: Per IRC discussion, move Julian's design notes index to his private page Member of the [[http://apache.org|Apache Software Foundation]] === My Pages === - SimpleAndSafeMerges - SupportedMergeScenarios + ==== Merge-related Design Notes ==== + Design notes, plans and ideas by JulianFoad about making branching and merging easier — or at least harder to get wrong. These are not "official", they are just a place for me to write down my thoughts in progress. + KeepingReintegratedBranchAlive — how to make it easier + + SimpleAndSafeMerges — ideas on what guidance/enforcements we could provide for users to merge within their preferred (and our supported) policies. + + SupportedMergeScenarios — documenting what kinds of merging patterns Subversion currently supports. + + MergeTrackingIdeas — the main idea being to support flexible branching topologies by tracking logical changes. + + BranchingMergingTerminology + + MergeBugsAndErrorReporting — simple bugs, and enhancements to error reporting. + + BranchesAndBranchRoots — about teaching Subversion what "a branch" is. + + CallGraphOfMergeCode + + UserInterfaceChanges +
