3 ms·
Thank you. I’ve lost months of my life to rebasing large patch sets against an actively maintained upstream. Your tool looks like it will save me a lot of gray
by adastra22 3y ago
Thank you. I’ve lost months of my life to rebasing large patch sets against an actively maintained upstream. Your tool looks like it will save me a lot of gray hair.
- cryptonector 3y agoYou're welcome! I had to rebase a patch to PG across thousands of upstream commits after having left it alone for a year+, and it was very painful going until I talked to @vdukhovni about it, and he had this tool, which was `slowrebase` at the time, and we improved it to do a sort of bisection approach to rebasing. That made the rebase I had to do go real fast! I never had to re-resolve the same conflicts using this script.
- pabs3 3y agoMore options: https://github.com/CTSRD-CHERI/git-mergify-rebase https://github.com/CTSRD-CHERI/git-mergify-rebase https://github.com/mhagger/git-imerge/ https://github.com/mhagger/git-imerge/ https://github.com/brooksdavis/mergify/ https://github.com/brooksdavis/mergify/