ntbang0901 f752f2db08 feat(vcs): make the merge editor work like IntelliJ's merge tool (#902) ...

The result pane starts from the base and every change, conflicting or not, gets Accept / Ignore next to its side; accepting one side of a conflict still lets the other side be appended, and the modifier key resolves using that side directly. Adds Resolve Simple Conflicts (word-level), Apply Non-Conflicting Changes from the left, right or both (optionally on opening), Revert Conflict Resolution, Accept Yours / Accept Theirs / Cancel / Apply, Compare Contents between any two versions, and undo back to the conflicted state. CRLF and UTF-16 files are written back exactly, deleted sides and binary files are handled, and the commands are registered as merge.* actions.

Refs #826

Co-authored-by: ntbang0901 <[email protected]>

2026-11-03 23:37:38 +08:00

..

__tests__

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

comparison

feat(vcs): recognize moved and edited code in the diff viewer (#868)

2026-11-03 23:26:36 +08:00

actions.tsx

feat(vcs): compare folder selections with revisions across repositories (#602)

2026-11-01 01:43:15 +08:00

blame.ts

feat(vcs): blame each merge side pane on the branch it belongs to (#391)

2026-10-30 19:42:05 +08:00

branches.ts

feat(github): pull request tool window, timeline and review flow (#477)

2026-10-31 07:50:43 +08:00

BranchFilterPopup.tsx

feat(vcs): Search the Git log branch filter (#129)

2026-10-28 19:32:54 +08:00

branchMenu.ts

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

branchOps.ts

chore: add knip and remove the dead code it reports (#247)

2026-10-29 23:21:56 +08:00

BranchWidget.module.css

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

BranchWidget.tsx

feat(github): pull request tool window, timeline and review flow (#477)

2026-10-31 07:50:43 +08:00

branchWidgetExtensions.ts

feat(github): pull request tool window, timeline and review flow (#477)

2026-10-31 07:50:43 +08:00

changelists.ts

chore: Format the codebase with oxfmt and check formatting in CI (#135)

2026-10-28 19:35:16 +08:00

changelistsUi.tsx

fix(i18n): Translate the remaining UI text (Git, hierarchy, pull requests, dialogs, aria labels) (#114)

2026-10-28 12:18:46 +08:00

changeOps.tsx

feat(vcs): support multiple repositories in the Git tool window

2026-10-29 14:30:32 +08:00

changes.ts

feat(vcs): add Add to .gitignore to the commit changes menu (#371)

2026-10-30 15:09:55 +08:00

chunkOptimizer.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

clone.module.css

feat(vcs): redesign the Clone Repository dialog and support shallow clones (#866)

2026-11-03 23:21:53 +08:00

clone.tsx

feat(vcs): redesign the Clone Repository dialog and support shallow clones (#866)

2026-11-03 23:21:53 +08:00

cm.ts

feat(vcs): recognize moved and edited code in the diff viewer (#868)

2026-11-03 23:26:36 +08:00

commitChecks.tsx

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

CommitDialog.module.css

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

CommitDialog.tsx

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

CommitOptions.tsx

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

commitStore.ts

feat(vcs): diff preview in the Git window's Local Changes tab (#714)

2026-11-03 10:18:39 +08:00

commitUi.ts

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

CommitView.module.css

feat(vcs): tint test files green in the changes tree (#940)

2026-11-03 14:40:18 +08:00

CommitView.tsx

feat(vcs): tint test files green in the changes tree (#940)

2026-11-03 14:40:18 +08:00

common.module.css

feat(vcs): redesign the Clone Repository dialog and support shallow clones (#866)

2026-11-03 23:21:53 +08:00

compare.tsx

feat(diff): compare directories and synchronize entries (#661)

2026-11-01 15:14:13 +08:00

CompareBranches.tsx

feat(vcs): git UX fixes for history, remotes, changelists, branch diff and merge view (#369)

2026-10-30 15:17:11 +08:00

compareData.ts

feat(diff): compare directories and synchronize entries (#661)

2026-11-01 15:14:13 +08:00

comparePaths.ts

feat(vcs): compare folder selections with revisions across repositories (#602)

2026-11-01 01:43:15 +08:00

ComparisonTree.tsx

feat(diff): compare directories and synchronize entries (#661)

2026-11-01 15:14:13 +08:00

confirmations.tsx

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

conflicts.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

conflictsUi.tsx

fix(i18n): Translate the remaining UI text (Git, hierarchy, pull requests, dialogs, aria labels) (#114)

2026-10-28 12:18:46 +08:00

dialogs.tsx

fix(i18n): Translate the remaining UI text (Git, hierarchy, pull requests, dialogs, aria labels) (#114)

2026-10-28 12:18:46 +08:00

diffAnnotations.ts

chore: Format the codebase with oxfmt and check formatting in CI (#135)

2026-10-28 19:35:16 +08:00

diffControls.ts

feat(vcs): IntelliJ's diff algorithm and change colouring in the diff viewer (#242)

2026-10-29 19:59:57 +08:00

DiffEditor.module.css

feat(vcs): diff preview in the Git window's Local Changes tab (#714)

2026-11-03 10:18:39 +08:00

DiffEditor.tsx

feat(vcs): recognize moved and edited code in the diff viewer (#868)

2026-11-03 23:26:36 +08:00

diffInput.ts

fix(vcs): resolve shelf files against their owning repository (#919)

2026-11-03 07:52:55 +08:00

diffNavigator.ts

feat(github): pull request tool window, timeline and review flow (#477)

2026-10-31 07:50:43 +08:00

diffOptions.ts

feat(vcs): recognize moved and edited code in the diff viewer (#868)

2026-11-03 23:26:36 +08:00

diffScroll.ts

fix(vcs): keep merge editor panes scrollable while they scroll together (#758)

2026-11-02 14:58:23 +08:00

diffViewerProviders.ts

feat(github): pull request tool window, timeline and review flow (#477)

2026-10-31 07:50:43 +08:00

DirectoryCompare.tsx

feat(diff): compare directories and synchronize entries (#661)

2026-11-01 15:14:13 +08:00

fileTree.ts

feat(diff): compare directories and synchronize entries (#661)

2026-11-01 15:14:13 +08:00

GitLog.module.css

fix(vcs): wrap long refs in Git log commit details (#999)

2026-11-03 22:44:30 +08:00

GitLog.tsx

feat(vcs): diff preview in the Git window's Local Changes tab (#714)

2026-11-03 10:18:39 +08:00

gitMenuDialogs.tsx

feat(vcs): support multiple repositories in the Git tool window

2026-10-29 14:30:32 +08:00

gitTabs.ts

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

graph.ts

feat: Third pass aligning core experience with IntelliJ IDEA

2026-10-25 21:24:00 +08:00

gutter.ts

feat: Align interactions with IntelliJ IDEA (#22)

2026-10-25 09:34:02 +08:00

historyActions.tsx

feat(vcs): show shelved changes and act on single files (#531)

2026-10-31 12:17:41 +08:00

hunkInclusion.ts

feat: Align interactions with IntelliJ IDEA (#22)

2026-10-25 09:34:02 +08:00

HunkPopup.module.css

Initial open-source release

2026-10-22 18:55:10 +08:00

HunkPopup.tsx

fix(i18n): Translate the remaining Git and pull request text (#116)

2026-10-28 12:38:25 +08:00

hunks.ts

chore: Format the codebase with oxfmt and check formatting in CI (#135)

2026-10-28 19:35:16 +08:00

ignore.ts

feat(vcs): add Add to .gitignore to the commit changes menu (#371)

2026-10-30 15:09:55 +08:00

incoming.ts

feat(vcs): Support several git repositories in one project (multi-root)

2026-10-23 23:15:09 +08:00

index.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

inlineBlame.ts

feat(vcs): inline blame for the current line (#778)

2026-11-02 12:11:12 +08:00

issueLinks.tsx

Initial open-source release

2026-10-22 18:55:10 +08:00

lineInlays.tsx

feat(github): pull request tool window, timeline and review flow (#477)

2026-10-31 07:50:43 +08:00

LocalHistory.module.css

Initial open-source release

2026-10-22 18:55:10 +08:00

LocalHistory.tsx

fix(i18n): Translate the remaining UI text (Git, hierarchy, pull requests, dialogs, aria labels) (#114)

2026-10-28 12:18:46 +08:00

localHistoryActions.ts

chore: Format the codebase with oxfmt and check formatting in CI (#135)

2026-10-28 19:35:16 +08:00

localHistoryKind.ts

Initial open-source release

2026-10-22 18:55:10 +08:00

logChanges.ts

fix(vcs): resolve shelf files against their owning repository (#919)

2026-11-03 07:52:55 +08:00

logOptions.ts

feat(vcs): Preview the selected file's diff in the Git Log (#175)

2026-10-29 09:25:01 +08:00

logPaneActions.ts

feat(vcs): support multiple repositories in the Git tool window

2026-10-29 14:30:32 +08:00

LogSettingsPage.module.css

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

LogSettingsPage.tsx

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

logStore.ts

chore: add knip and remove the dead code it reports (#247)

2026-10-29 23:21:56 +08:00

mergeActions.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

mergeDiff3.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

MergeEditor.module.css

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

MergeEditor.tsx

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

mergeGutters.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

mergeKind.ts

Initial open-source release

2026-10-22 18:55:10 +08:00

mergeMenus.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

mergeModel.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

mergeScroll.ts

fix(vcs): keep merge editor panes scrollable while they scroll together (#758)

2026-11-02 14:58:23 +08:00

MergeToolbar.tsx

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

model.ts

chore: add knip and remove the dead code it reports (#247)

2026-10-29 23:21:56 +08:00

movedCode.ts

feat(vcs): recognize moved and edited code in the diff viewer (#868)

2026-11-03 23:26:36 +08:00

multiRoot.ts

feat(vcs): support multiple repositories in the Git tool window

2026-10-29 14:30:32 +08:00

operations.tsx

fix(vcs): resolve shelf files against their owning repository (#919)

2026-11-03 07:52:55 +08:00

ops.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

patches.tsx

feat(vcs): show shelved changes and act on single files (#531)

2026-10-31 12:17:41 +08:00

rebase.tsx

feat(vcs): support multiple repositories in the Git tool window

2026-10-29 14:30:32 +08:00

rebasePlan.ts

chore: Format the codebase with oxfmt and check formatting in CI (#135)

2026-10-28 19:35:16 +08:00

recentChanges.ts

feat: Third pass aligning core experience with IntelliJ IDEA

2026-10-25 21:24:00 +08:00

remoteUi.tsx

fix(vcs): keep a deleted-upstream branch pushable in the multi-repo Push dialog (#1004)

2026-11-03 20:33:41 +08:00

repoBranches.ts

feat(vcs): Add a modal commit mode and fill in Git log, branch popup and settings (#144)

2026-10-28 21:49:43 +08:00

repositoryPaths.ts

fix(vcs): resolve shelf files against their owning repository (#919)

2026-11-03 07:52:55 +08:00

reviewGutter.ts

feat(github): pull request tool window, timeline and review flow (#477)

2026-10-31 07:50:43 +08:00

RevisionChooser.tsx

feat(vcs): compare folder selections with revisions across repositories (#602)

2026-11-01 01:43:15 +08:00

shelf.tsx

fix(vcs): resolve shelf files against their owning repository (#919)

2026-11-03 07:52:55 +08:00

store.ts

fix(vcs): break the .git/index self-refresh loop that froze the UI (#339)

2026-10-30 13:34:18 +08:00