Hacker News Reader

Visual studio and Vs code has this aswell i always used that never found IT hard to do conflicts

VS Code doesn't have 3 way merge view, yet. Looks like it's coming soon, though https://github.com/microsoft/vscode/issues/37350