Symmetric Merge -- Wiki page
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 27 Feb 2012 13:15:30 +0000 (GMT)
As many of you are aware I've been looking at improving merge in various ways. I'd like to ask for feedback at this stage on the Wiki page <http://wiki.apache.org/subversion/SymmetricMerge> (renamed from SvnMergeTheory). The essential point is that it looks like we can relatively easily enhance Subversion so that a plain 'merge' command will act as either 'sync' or 'reintegrate' automatically, depending on the history of the branch, and furthermore will work better than either of them in the scenario of continuing work on a branch after a reintegrate.
How much of what I've written makes sense? I know it could do with much more detailed worked examples, with concrete Subversion commands and output to prove the connection between theory and practice.
This is an archived mail posted to the Subversion Dev mailing list.