On Sat, Nov 28, 2015 at 05:09:32PM +0000, brian m. carlson wrote: > > I got a bunch of conflicts trying to merge it into 'next' and 'pu' and > > punted on it. I think the tricky bits are coming from > > dt/refs-backend-pre-vtable, where there was a lot of code movement. > > I think as for merging into the latest pu, the thing you want to do in > refs.c is simply take what pu has. You'll have to fix up one additional > struct object call site. The same thing goes for builtin/merge.c and > builtin/branch.c, where the code I changed has since been eliminated. > > I also noticed that merge-recursive.c and builtin/ff-refs.c needed some > minor fixups as well, but a quick compile will show you where those are. > I've included a diff for those two below. Thanks, this gave me an opportunity to play with Junio's merge-fix scripts. :) The result will be in the "pu" I push out shortly. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html