On Thu, Jun 14, 2018 at 12:33 PM Derrick Stolee <stolee@xxxxxxxxx> 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