On 08 Mar 2021 15:38, Junio C Hamano wrote: > Mike Frysinger <vapier@xxxxxxxxxx> writes: > > For people who want to rebase their work onto the latest branch > > (instead of merging), but there's many conflicting changes. This > > allows you to address those conflicts one-by-one and work through > > each issue instead of trying to take them all on at once. > > I wonder how well this compares or complements with Michael > Haggerty's "git imerge". thanks, hadn't heard of that before > > If there's no interest in merging this into contrib, then this is more spam, > > and anyone interested can use https://github.com/vapier/git-rebase-catchup > > The thinking during the past several years is that the Git ecosystem > and userbase have grown large enough, and unlike our earlier years, > individual add-on's like this (and "imerge" I mentioned earlier) can > thrive without being in-tree to gain an undue exposure boost over > its competitors, so I doubt that adding more stuff to contrib/ would > be a good direction to go in the longer term. i'm totally fine with "no". thanks for the info. -mike
