Hacker News Reader

IIRC vscode with gitlens extension shows blame on hover, also for the conflicting lines.

The new 3 way merge editor in VS Code tries to load the documents for base, yours and theirs from the corresponding commit URI, so that extensions such as gitlens can show the line history for each document - they don't even have to know about the merge editor. (disclaimer - I work on VS Code and its 3 way merge editor)

> for base, yours and theirs

I really hate that relative terminology. Call them "working copy", "merging commit" and "common ancestor" or something similarly absolute. And give me the revision/commit id's for each, so it's crystal clear in case I want to check up manually.

Not a dig on the vscode extension, but 3-way diff tools in general.

Yeah I 100% agree. Especially as Git gets it backwards in some cases! It's not even consistent about the names. Sometime I see "current" and "incoming" which is not really any better.

> And give me the revision/commit id's for each

It could show the branch names! `change on master`, `change on myfeature` or whatever.

The 3 way merge editor actually shows the branch name!

Maybe I'll give it another got but to be honest I found the new merge editor even more confusing than just reading zdiff3. Sorry!

That's what I'm using. Unfortunately it doesn't. :-/

Reply on news.ycombinator.com