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". > 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. > create mode 100755 contrib/rebase-catchup/git-rebase-catchup.py And it does not help for this to be written in Python (which we've been moving away from). Having said all that, the end-user community may benefit from having a well curated set of third-party tools advertised at a single autoritative-sounding place, but it is dubious that contrib/ subdirectory of my tree should be such a place (I won't be its curator anyway). Perhaps there is an opening for non-code contribution for those without much programming experience but with great organizational skills. Thanks.
