On Wed, Jan 20, 2021 at 10:46:29PM +0100, Jacob Vosmaer wrote: > On Wed, Jan 20, 2021 at 8:45 PM Jeff King <peff@xxxxxxxx> wrote: > > > I also rage-replaced peel_ref() with a function taking an oid so we > > never have to do that digging again. Posted separately in its own > > thread. > > That sounds like a good solution. Where does that leave my patch? Do I > need to wait for that new commit somehow? I don't know how that works, > "contributing to Git" wise. Nope, you shouldn't need to do anything. The conflict is minimal enough that the two can proceed independently, and the maintainer can resolve it. -Peff
