Michael Haggerty

Allow a rebase to be `finish`ed before it is done

1

I'm writing this up in a little more detail because @waldyrious [asked about it](https://github.com/mhagger/git-imerge/pull/90#issuecomment-231526542). It would be nice to allow an in-progress rebase to be simplified to "lock in" the...

We need some kind of build/install infrastructure

3

At the moment, all it would have to do is rewrite the shebang line at the top of git-imerge to cause it to be run with the correct Python interpreter...

Allow micromerges to be broken down even further

3

This was first discussed in #72. Suppose an imerge is in the following state: ``` o---0---1---2---3 | | | A---o---X | | | B---Y---? | C ``` Normally you would...

If the bisection heuristic fails, it can be that an autofill merge fails even though it was expected to succeed. We need a way to test such scenarios systematically. I...

A simple implementation (one that can do no conflict resolution of differing resolution conflicts) should be pretty easy.

Add new convenience options like `--no-branches`, `--stash`, etc.

1

All of the following can be accomplished using reference filtering (#75), but we could add new options to make them a tad more convenient (and these options would nicely complement...

Turn off git-rerere when initiating a manual merge, just as we already do when automerging. This might fix the problem reported in #161.

Whirlwind of change ideas

1

Hi! Thanks for this project! I've been working towards using it for my own home automations. I made a lot of changes to this library along the way that might...