Re: RFC: Merge-related plans

2018-05-29 Thread Elijah Newren
Hi Stefan, On Tue, May 29, 2018 at 3:12 PM, Stefan Beller wrote: >>> (B) sounds like an independent feature, which could go in parallel? >> >> B may sound like an independent feature, but it needs a merge >> algorithm that doesn't mess with the working tree > > I agree on that, > >> so it

Re: RFC: Merge-related plans

2018-05-29 Thread Stefan Beller
context: https://public-inbox.org/git/cabpp-bfqjzhfcjz1qvhvvcmd-_sofi0fkm5pexewzzn+zw2...@mail.gmail.com/ Hi Elijah, >> Most items forward-reference "Depends on () up to here; >> (H) seems independent, but might be a good first start. >> (G) [8] is queued as origin/en/merge-recursive-tests, or

Re: RFC: Merge-related plans

2018-05-29 Thread Elijah Newren
Hi Stefan, On Tue, May 29, 2018 at 11:19 AM, Stefan Beller wrote: > On Mon, May 28, 2018 at 1:48 PM, Elijah Newren wrote: >> Currently, I would like to: >> >> A) Fix cases where directory rename detection does not work with >>rebase/am due to how they call merge-recursive. >> >>Notes:

Re: RFC: Merge-related plans

2018-05-29 Thread Stefan Beller
On Mon, May 28, 2018 at 1:48 PM, Elijah Newren wrote: > Hi everyone, > > I have some merge-related plans (and work in progress) that I'd like > to get some feedback on in order to find what order would be best to > address things in, if there are special steps I should take while > approaching

RFC: Merge-related plans

2018-05-28 Thread Elijah Newren
Hi everyone, I have some merge-related plans (and work in progress) that I'd like to get some feedback on in order to find what order would be best to address things in, if there are special steps I should take while approaching some of the bigger items, and even if folks disagree with any of the