Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-12-04 Thread Jacob Keller
On Mon, Dec 4, 2017 at 11:33 AM, Stefan Beller wrote: > On Sat, Nov 25, 2017 at 9:59 PM, Jacob Keller wrote: >> On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren wrote: >>> On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-12-04 Thread Stefan Beller
On Sat, Nov 25, 2017 at 9:59 PM, Jacob Keller wrote: > On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren wrote: >> On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote: >>> On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-11-25 Thread Jacob Keller
On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren wrote: > On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote: >> On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote: > >>> But this line of though might be distracting from your

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-11-25 Thread Elijah Newren
On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote: > On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote: >> But this line of though might be distracting from your original point, >> which was that we have so much to keep in mind when doing tree

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-11-15 Thread Jacob Keller
On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote: > Thanks for your reply! > > On Tue, Nov 14, 2017 at 9:17 AM, Elijah Newren wrote: >> On Mon, Nov 13, 2017 at 3:46 PM, Stefan Beller wrote: >>> On Mon, Nov 13, 2017 at 3:39 PM,

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-11-14 Thread Stefan Beller
Thanks for your reply! On Tue, Nov 14, 2017 at 9:17 AM, Elijah Newren wrote: > On Mon, Nov 13, 2017 at 3:46 PM, Stefan Beller wrote: >> On Mon, Nov 13, 2017 at 3:39 PM, Elijah Newren wrote: >>> On Mon, Nov 13, 2017 at 2:12 PM, Stefan

submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-11-14 Thread Elijah Newren
On Mon, Nov 13, 2017 at 3:46 PM, Stefan Beller wrote: > On Mon, Nov 13, 2017 at 3:39 PM, Elijah Newren wrote: >> On Mon, Nov 13, 2017 at 2:12 PM, Stefan Beller wrote: >>> I wanted to debug a very similar issue today just after reviewing