Kevin Goslar

Using Git's content-addressable storage system makes it easy to compare file versions on different branches. Show the status of all conflicting files after encountering a merge conflict: `git ls-files --unmerged`...

Updated criteria for detecting phantom merge conflict for an unmerged file path in a merge conflict: - permissions are the same - content blob SHA of file in the incoming...

Phew, this is implemented now. Made the product quite a bit more complex, but I think that complexity is well spent given that they solve phantom merge conflicts, which are...

@stephenwade thanks for the detailed repro for the rebasing issue that requires `--onto`! I think I get the idea now. Will try to repro in an end-to-end test so that...