3 ms·
That gist seems like a simplified version of https://github.com/mhagger/git-imerge https://github.com/mhagger/git-imerge, so check that out if you haven't. (I h
by martinvonz 5y ago
That gist seems like a simplified version of https://github.com/mhagger/git-imerge https://github.com/mhagger/git-imerge, so check that out if you haven't. (I haven't looked at git-imerge in a long time, so I should read about it again myself.)
- cryptonector 5y agoI'll take a look, thanks for the link! EDIT: The idea of being able to suspend/resume and push/fetch in-progress merges/rebases is very cool indeed. It's hard to tell if it could speed up the task of rebasing across thousands of commits or not -- the README doesn't say. I like Viktor's script because it's very focused on one thing: quickly rebasing local commits across thousands of new upstream commits with a minimum of conflicts -- a simple solution to a simple problem statement (though the problem can feel huge when you have it).