On Tue, Jul 28, 2020 at 03:23:45PM -0700, Junio C Hamano wrote: > It was more painful than I would have thought to merge this topic, > as we seem to have gained quite a few new calling sites (it shows > how popular and useful this API is). Hopefully some of the merge > conflict resolutions would be resurrected automatically from the > rerere database ;-) I'm not too surprised; it made a little chaos with my personal topics, too. I'm happy to help with resolutions, but it looks like you've already merged it to "seen", which means the worst of it is mostly over. I did specifically wait on it until until after a release, but I think we pretty much always have topics in flight these days. There is no quiet time. :) If I swap out the final patch with "s/items/v/" that may cause a _little_ more trouble, but perhaps not quite as much (only some of the sites access the fields directly). -Peff
