Re: Two-phase merge

2012-05-10 Thread Julian Foad
On 29 April, Stefan Fuhrmann wrote: > Julian Foad wrote: >> Stefan Fuhrmann wrote: >>> [...] The proposal I make here is not >>> an alternative to e.g. "Symmetric Merge" but rather a >>> refined merge strategy that would also benefit the current >>> merge. [...] >>> In end, we will always merge ind

Re: Two-phase merge

2012-04-29 Thread Stefan Fuhrmann
Julian Foad wrote: Stefan Fuhrmann wrote: This one is basically the technical post promised in my "Merge Policies" post. The proposal I make here is not an alternative to e.g. "Symmetric Merge" but rather a refined merge strategy that would also benefit the current merge. Today, the merge algo

Re: Two-phase merge

2012-04-25 Thread Julian Foad
Stefan Fuhrmann wrote: > This one is basically the technical post promised in my > "Merge Policies" post. The proposal I make here is not > an alternative to e.g. "Symmetric Merge" but rather a > refined merge strategy that would also benefit the current > merge. > > Today, the merge algorithm wi