Michael Haggerty
Michael Haggerty
This happens when the bisect approach to finding the "farthest along" commits that can be merged gives an answer, but some of the intermediate merges can't be performed. I've seen...
This is awesome! I'd thought about doing this but haven't had time to get to it. So it's :sparkles:really great:sparkles: that you are working on this. I do have one...
A note about version numbers: It's really important that we start defining version numbers for `git-imerge`. One reason is because packagers need them (e.g., see #54), and it is in...
> I think it would be prudent to add more tests. Any thoughts on adding support for a testing framework? Absolutely! Are you trying to make me fall in love...
Thanks for the report. The core of the problem is that `git-imerge` uses the "porcelain" command, `git log`, rather than the corresponding "plumbing" command, `git rev-list`. (That, in turn, is...
I don't use `gpgsign` myself, so I'm not really familiar with the details of how it works. Let me braindump a few bits of information that might be related: *...
/cc @ralfth, who contributed the bash completion support.
I like the idea, but why an environment variable? Wouldn't it be more natural to use a git configuration setting, as we already do for `imerge.editMergeMessages`? That would also allow...
Awesome that you are working on this! I'll add some comments and thoughts to the diff.
I don't think you should use the word "build" in the UI and implementation, because in general people might want to run arbitrary tests before accepting a merge--maybe less than...