Michael Haggerty

I use `git imerge remove`. But this leaves you in a detached-HEAD state, so you have to follow it up with `git checkout SOMEBRANCH`. It would be nice if this...

If you could reproduce this problem in the form of a failing unit test, that would be a helpful step towards solving it.

> Are you aware of `git rerere`? This is a possibility for merges done outside of `git-imerge`, but `git-imerge` should always temporarily disable `rerere` whenever it initiates a merge itself....

@CmdQ: > ``` > Staged 'path/to/conflict.py' using previous resolution. > ``` :point_up: I believe that this message comes from rerere. `git-imerge` must not be turning it off correctly. `git-imerge` does...

There's no automation around that. Part of what would be required is to remove some of `git-imerge`'s special references that it uses to keep track of progress: `refs/imerge/$NAME/manual/$I-$J` and `refs/imerge/$NAME/auto/$I-$J`....

> I have to admit that I do not understand what you are suggesting – so when I have found the "bad" merge commit by bisecting, I just rerun the...

What happens if you execute that command manually just after the `git-imerge` failure: git checkout -f 125bb7bd9ee8c7edc1ed6ca29d8b78c01d0db120 ? Maybe its output would be illuminating.

In this particular case, you could try git imerge 7e5dce8 which would merge the individual commits `638c8ca` and `7e5dce8` into `feature-3`. Assuming that `9d988ea` is not an evil merge, the...

This would be helpful, but what would you think about adding these numbers around the boundaries of the diagram output itself? For example, maybe something like ``` 1 1 2...

> I don't really get the "merge frontiers" graph. Basically, any merge to the left and up from the "merge frontier" is assumed to be doable without conflicts (given the...