Michael Haggerty

> With the rebase over 131 commits in master the main diagram is already unreadable. because it doesn't fit the screen. If you pipe it to `less -S` then you...

My understanding was that `python setup.py install` would somehow arrange for this to be invoked as a module by the correct python interpreter. @jdufresne do you have an opinion about...

`COMMIT3` is not interesting, because it is equivalent to git checkout $COMMIT3 git rebase --onto $COMMIT1 $COMMIT2 So let's focus on the latter. How _should_ it be handled by `git-imerge`?...

I'm no expert on python package installs and am not likely to have time to figure this out anytime soon. If anybody has a suggestion (preferably in the form of...

That wouldn't be in the spirit of the incremental merge, so it would complicate the idea quite a bit: * In your example, you wouldn't have merge `A-Y`, so what...

I don't know a lot of the details of `--preserve=merges` so it's hard for me to say how difficult it would be. ISTM that it depends a lot on the...

You must amend the last commit. `git imerge continue` and `git imerge record` only recognize a manual merge based on its having direct parents that are diagonally adjacent in the...

This workflow is indeed not well documented. What would work today (obviously not very user-friendly): * You start an imerge and merge what you can. * You push all of...

This is an interesting idea and I've also thought about something like this. I got stuck because I don't see an elegant way to generalize it to multiple manual merges;...

What is the point of storing more intermediate merges? Is it so that git has enough history that it can use to do subsequent merges? Is it so that the...