Skip to content
shipped·v0.1.0 · download
GitView
Download VSIX
v0.1.0·MIT·CI verified

See Git clearly.

Resolve conflicts in a true 3-way editor, then inspect history, branches, changes, and diffs without leaving VS Code. Powered by your local git CLI.

Download VSIXView source

MIT · no accountVS Code 1.85+ · local Git · no telemetry

src/api/user.ts●
1loadUser(id) {
2 user = get(id)
3 return profile
4}
● 1 conflict

live demo · conflict

the same file · drag to compare

Markers in, clarity out.

Stock VS Code drops <<<<<<< into your file. GitView builds the same conflict from Git stages in three panes — editable Result, ✦ auto-resolve where both sides agree.

after · GitView
Resolve Conflicts●✦ 7/8 auto
Yours
1loadUser(id) {
2 user = get(id)
3 return profile
4 metrics.track()
5}
Result
1loadUser(id) {
2 user = get(id)
3 return profile // ✦
4 metrics.track()
5}
Theirs
1loadUser(id) {
2 user = get(id)
3 return profile // ✦
4 metrics.track()
5}
● ready to apply

drag to compare · stock markers ↔ three panes

Ready to stop scrolling past markers?

Free · MIT · VS Code tested · compatible forks supported.

Download VSIX Other editors →

what happens

From git merge to commit.
Three terminal outputs.

  1. 01
    ~ 5s

    Run git merge like you always do.

    Same command, same terminal, same conflict. No new flag to remember.

    $ git merge feature/login
▸ Auto-merging src/api/user.ts
! CONFLICT (content): Merge conflict in src/api/user.ts
! Automatic merge failed; fix conflicts and then commit.
  2. 02
    ~ ~1s

    Open GitView. Three panes, no markers.

    Local · Result · Repository from index stages. Edit the Result pane, jump with F7, ✦ auto-resolve identical blocks.

    $ GitView: Resolve conflict
▸ read :1: base · :2: ours · :3: theirs
▸ 1 conflict · 2 trivial

# F7 jump · ✦ auto-resolve · edit Result · Apply
  3. 03
    ~ ~30s

    Resolve, apply, commit.

    Accept Local / Incoming / both, edit Result if needed, Apply (optional auto-stage). Commit when you're ready.

    $ git status
▸ On branch feature/login
● All conflicts fixed but you are still merging

$ git commit -m "merge master"
▸ [feature/login abc1234] merge master

why GitView

You know the pain.
Here's the fix.

01

Markers force you to scroll, squint, and guess.

Three panes from real Git stages — Local, editable Result, Repository. Word-level highlighting. ✦ clears identical edits.

02

History, blame, and staging live in three different places.

One Git Workspace tool window — changes, commit, branches, log, diff, temporary work — plus Explorer Git menu actions.

03

Cloud tools upload your code. Visual tools can drift from Git.

No product telemetry. Shells out to your local git CLI — same operations, same credentials, trusted workspace only.

under the hood

We don't reimplement merge.

Conflicts build from index stages and run through git merge-file. History, commit, remotes, and review shell out to the same git CLI — no parallel SCM model.

  1. 01

    Shell-out. No daemon.

    One process per conflict. Calls git, reads :1: :2: :3: from the index, returns. No filesystem watcher. No boot service.

    git merge-file --ours --theirs --base …
  2. 02

    Strict byte-equality.

    ✦ only when both sides wrote the same line byte-for-byte. No fuzzy match. No ML. Just sha1(left) === sha1(right).

    if (sha1(ours) === sha1(theirs)) accept()
  3. 03

    No product telemetry.

    Nothing phones home to GitView servers. Git ops stay on your machine; optional hosted review only talks to the GitHub/GitLab API you configure.

the roadmap

Shipped · Building · Queued.

You're on v0.1.0. Merge, history, workspace, and review already ship. Next up: denser dialogs and interactive rebase — no dark patterns, no "pro" tier.

  1. v0.1.0
    shipped

    GitView — full surface

    shipped

    True 3-way merge studio from Git stages :1: / :2: / :3: (editable Result, ✦ auto-resolve, F7). Git Workspace tool window — changes, commit, branches, log, diff, temporary work. History, blame, compare. Explorer Git menu (stage, remotes, stash/shelve, merge, rebase…). Hosted GitHub/GitLab review with Secret Storage tokens. CI-verified, MIT, no product telemetry.

  2. v0.2.0
    next

    Denser IDE ops dialogs

    building

    Branch popup with search and groups. Push / pull-update dialogs with strategy and impact preview. Reset soft·mixed·hard with a clear impact view. Multi-file conflict overview with bulk accept — the P0 wireframes (W05–W08, W10–W11).

  3. v0.3.0
    queued

    Interactive rebase editor

    queued

    Visual rebase todo list with preview (W09). Pick, squash, fixup, reorder — see the resulting history before you run it. Same mental model as the rest of GitView.

  4. later
    queued

    Compare branches & polish

    queued

    Dedicated compare-branches screen, richer stash details, commit message history, and hosted-review density polish. The menu actions already work — these are the deeper IDE surfaces.

faq

You asked. We shipped answers.

get GitView

Download today. Marketplace next.

Get the v0.1.0 VSIX from GitHub Releases, then install it from your editor's Extensions menu or CLI. No account required.

Download VSIXView source

v0.1.0 · CI verified · MIT · VS Code tested

  • What you need
  • VS Code 1.85+

    Release-tested on VS Code. Compatible forks can install the same VSIX.

  • Git on PATH

    Shells out to the local git CLI at runtime.

  • Installing the VSIX needs neither Node nor pnpm. Building from source remains available for audit and contribution.

$ code --install-extension ~/Downloads/gitview-0.1.0.vsix
# or Extensions → … → Install from VSIX…
Release-tested on VS Code 1.85 and newer.binary: code

Prefer to audit or contribute?

$ git clone https://github.com/outof0/gitview.git && cd gitview
$ pnpm install && pnpm run package
▸ builds gitview-0.1.0.vsix
VS Code tested · compatible forks supportedQuestions? GitHub issues →

privacy

No tracking by GitView.

This website sets no cookies and loads no analytics or advertising services. The extension sends no product telemetry.

Local Git operations stay on your machine. Hosted review connects only to the GitHub or GitLab API that you explicitly configure, and credentials are stored in the editor's Secret Storage.

Questions or security reports: hello.outof0@gmail.com.