Re: Symmetric Merge -- Wiki page

2012-03-05 Thread Branko Čibej
On 02.03.2012 09:45, Justin Erenkrantz wrote: > For branches that tend to be reintegrate targets - feature work on a > short or long-lived branch - I tend to see it's a different pattern > and doesn't usually involve cherry-picks - it's more the > sync/reintegrate model with complete merges you've

Re: Symmetric Merge -- Wiki page

2012-03-05 Thread Branko Čibej
On 27.02.2012 14:15, Julian Foad wrote: > 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 > (renamed from > SvnMergeTheory). The essential point is th

Re: Symmetric Merge -- Wiki page

2012-03-02 Thread Justin Erenkrantz
On Mon, Feb 27, 2012 at 5:15 AM, Julian Foad wrote: > 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 > (renamed from > SvnMergeTheory).  The essentia

Re: Symmetric Merge -- Wiki page

2012-03-01 Thread Julian Foad
Stefan Sperling wrote: > Julian Foad wrote: >> >> >> 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 th

Re: Symmetric Merge -- Wiki page

2012-02-29 Thread Stefan Sperling
On Mon, Feb 27, 2012 at 01:15:30PM +, Julian Foad wrote: > 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 (renamed from > SvnMergeTheory).  The ess

Symmetric Merge -- Wiki page

2012-02-27 Thread Julian Foad
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 (renamed from SvnMergeTheory).  The essential point is that it looks like we can relatively easily enhan