On Thu, Jun 15, 2017 at 5:52 PM, Michael Eager <ea...@eagerm.com> wrote:
> One other variant of the rebase approach I've thought of is to do > this incrementally, rebasing the old repo against an upstream commit > a short time after the old repo was forked, fixing any conflicts, > rebuilding and fixing build failures. Then repeat, with a bit > newer commit. Then repeat, until I get to the top. This sounds > tedious, but some of it can be automated. It also might result in > my making the changes compatible with upstream code which was later > abandoned or significantly changed. This sounds like https://github.com/mhagger/git-imerge https://www.youtube.com/watch?v=FMZ2_-Ny_zc
