From: Stefan Beller Date: Thu, 14 Jun 2018 21:31:46 GMT Subject: Re: [PATCH v2 05/31] tree: add repository argument to lookup_tree Message-ID: In-Reply-To: <709bd61c-70fc-a925-efba-58ab9be265c9@gmail.com> On Thu, Jun 14, 2018 at 12:33 PM Derrick Stolee wrote: > > The 'tree' member of 'struct commit' was renamed to 'maybe_tree'. > > Resolving the merge was not very simple. I have a working merge > available on GitHub [1] as commit 99a899f7c12ef73840dbe79c71acb11034d707dd. Thanks for pointing this out and resolving the merge. ds/generation-numbers seems to be cooking in next for longer already, so I might just rebase this series on top of that as well. Thanks for the heads up! Stefan