Hacker News Reader

And, on the command-line at least, "theirs" and "ours" are reversed (only) for "rebase" [1] so that means, at least for me, I have to mentally ask myself "are theirs/ours reversed for this command?" for every command I execute, they might as well be called "foo" and "bar" at this point for me.

[1] https://git-scm.com/docs/git-rebase#Documentation/git-rebase...

Did you see the screenshots? Looks like it shows the branches at least.

I did see the screenshots. That's what triggered my comment. I did not see any branch names. Now I see "nh-scroll-fix" and "origin/fix-simulate-na..." in the conflict dialog, but not in the merge dialog. Branch names seem insufficient anyway though, but it would be a slight improvement I guess.

And then they get misspelled as "their's" and "our's".