M4.8: merge conflicts with a three-pane resolve view
Backend (crates/vcs/src/merge.rs, cmd/git_merge.rs via start_with):
git.merge {branch} -> {result: merged|upToDate|conflicts, conflicts},
git.mergeAbort, git.conflictVersions {path} -> {base?, ours, theirs,
binary, tooLarge} from the index stages :1:/:2:/:3:, git.markResolved
{paths}. Repo::lock becomes pub(crate) so merge and abort hold the
mutation lock.
UI (ui/src/components/vcs/merge/): merge dialog with branch picker,
conflicts list from the shared status store, a three-pane resolve view
(ours / editable result / theirs) with accept left/right per chunk,
accept all, previous/next conflict, Apply through the file's buffer then
mark resolved, keep-a-side for modify/delete, abort after confirmation.
Own three-way line merge on @codemirror/merge's diff. UI commands
vcs.merge, vcs.resolveConflicts, vcs.abortMerge (no default shortcuts);
the Changes window opens conflicted rows in the resolve view.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
74c674ed12
commit
d82e57b3ac
26 changed files with 3872 additions and 16 deletions
|
|
@ -19,12 +19,14 @@
|
|||
"command.settings.open": "Settings…",
|
||||
"command.terminal.open": "Terminal",
|
||||
"command.unavailable": "{command} cannot run right now",
|
||||
"command.vcs.abortMerge": "Abort Merge…",
|
||||
"command.vcs.branches": "Branches…",
|
||||
"command.vcs.checkout": "Check Out Branch",
|
||||
"command.vcs.clone": "Clone Repository…",
|
||||
"command.vcs.commit": "Commit…",
|
||||
"command.vcs.fetch": "Fetch",
|
||||
"command.vcs.manageRemotes": "Manage Remotes…",
|
||||
"command.vcs.merge": "Merge…",
|
||||
"command.vcs.newBranch": "New Branch…",
|
||||
"command.vcs.nextChange": "Next Change",
|
||||
"command.vcs.openChanges": "Changes",
|
||||
|
|
@ -32,6 +34,7 @@
|
|||
"command.vcs.pull": "Pull",
|
||||
"command.vcs.push": "Push",
|
||||
"command.vcs.refresh": "Refresh Changes",
|
||||
"command.vcs.resolveConflicts": "Resolve Conflicts…",
|
||||
"command.vcs.showDiff": "Show Diff",
|
||||
"command.vcs.showHistory": "Show History",
|
||||
"command.vcs.showLog": "Log",
|
||||
|
|
@ -172,6 +175,12 @@
|
|||
"notification.vcs.fetchFailed": "Fetch failed: {reason}",
|
||||
"notification.vcs.fetched": "Fetched from every remote",
|
||||
"notification.vcs.historyNoFile": "Open a file or pass a path to show its history",
|
||||
"notification.vcs.mergeAborted": "Merge aborted",
|
||||
"notification.vcs.mergeConflicts": "Merging {branch} stopped on conflicts (conflicted files: {count}). Resolve them, then commit.",
|
||||
"notification.vcs.mergeFailed": "Git did not merge {branch}: {reason}",
|
||||
"notification.vcs.mergeNotSaved": "Merge of {branch} cancelled: not every file could be saved first.",
|
||||
"notification.vcs.mergeUpToDate": "Already up to date with {branch}",
|
||||
"notification.vcs.merged": "Merged {branch}",
|
||||
"notification.vcs.newBranchFailed": "Branch {branch} was not created: {reason}",
|
||||
"notification.vcs.pullFailed": "Pull failed: {reason}",
|
||||
"notification.vcs.pullNotSaved": "Pull cancelled: not every file could be saved first.",
|
||||
|
|
@ -180,6 +189,7 @@
|
|||
"notification.vcs.pushed": "Pushed {branch} to {remote}",
|
||||
"notification.vcs.pushedUpstream": "Pushed {branch} to {remote} and set it as the upstream",
|
||||
"notification.vcs.remoteCancelled": "Git operation cancelled",
|
||||
"notification.vcs.resolved": "Marked {path} as resolved",
|
||||
"notification.vfs.pumpFailed": "Applying changes on disk failed: {reason}",
|
||||
"notification.watch.failed": "Lutra stopped watching the project for changes on disk: {reason}",
|
||||
"palette.label": "Command palette",
|
||||
|
|
@ -388,6 +398,53 @@
|
|||
"vcs.log.refresh": "Reload the history",
|
||||
"vcs.log.toolWindow.title": "Log",
|
||||
"vcs.log.truncated": "More files changed than are listed here.",
|
||||
"vcs.merge.abort": "Abort merge…",
|
||||
"vcs.merge.abortConfirm": "Abort merge",
|
||||
"vcs.merge.abortQuestion": "Abort the merge? The files and the index return to how they were before it; resolutions made so far are lost.",
|
||||
"vcs.merge.acceptLeft": "Accept left",
|
||||
"vcs.merge.acceptRight": "Accept right",
|
||||
"vcs.merge.allLeft": "Accept all left",
|
||||
"vcs.merge.allResolved": "No open conflicts",
|
||||
"vcs.merge.allRight": "Accept all right",
|
||||
"vcs.merge.apply": "Apply and mark resolved",
|
||||
"vcs.merge.applyHint": "Resolve every conflict first",
|
||||
"vcs.merge.back": "Back",
|
||||
"vcs.merge.binary": "Binary file: it cannot be merged here. Put the version you want on disk, then mark it resolved.",
|
||||
"vcs.merge.branchesLabel": "Branches to merge",
|
||||
"vcs.merge.close": "Close",
|
||||
"vcs.merge.commit": "Commit…",
|
||||
"vcs.merge.conflictsHint": "These files have conflicts. Resolve each one, then commit to finish the merge.",
|
||||
"vcs.merge.conflictsLabel": "Conflicted files",
|
||||
"vcs.merge.deletedOurs": "The current branch deleted this file and the merged branch changed it. Keep the merged branch's version, or delete the file and mark it resolved.",
|
||||
"vcs.merge.deletedTheirs": "The merged branch deleted this file and the current branch changed it. Keep the current branch's version, or delete the file and mark it resolved.",
|
||||
"vcs.merge.filter": "Filter branches",
|
||||
"vcs.merge.invalidMergeParams": "vcs.merge takes {branch?: string}",
|
||||
"vcs.merge.invalidParams": "vcs.resolveConflicts takes {path?: string}",
|
||||
"vcs.merge.keep": "Keep merging",
|
||||
"vcs.merge.keepOurs": "Keep the current branch's version",
|
||||
"vcs.merge.keepTheirs": "Keep the merged branch's version",
|
||||
"vcs.merge.loadFailed": "The conflict cannot be read: {reason}",
|
||||
"vcs.merge.loading": "Reading the conflict from Git…",
|
||||
"vcs.merge.markAsIs": "Mark resolved as on disk",
|
||||
"vcs.merge.next": "Next conflict",
|
||||
"vcs.merge.noBranches": "No other branch to merge",
|
||||
"vcs.merge.noConflicts": "No conflicts left. Commit to finish the merge.",
|
||||
"vcs.merge.openCount": "{open} of {total} conflicts open",
|
||||
"vcs.merge.ours": "Current branch",
|
||||
"vcs.merge.oursBranch": "Current branch ({branch})",
|
||||
"vcs.merge.previous": "Previous conflict",
|
||||
"vcs.merge.resolve": "Resolve…",
|
||||
"vcs.merge.resolveFile": "Resolve {path}",
|
||||
"vcs.merge.result": "Result",
|
||||
"vcs.merge.saveFailed": "The result could not be saved: {reason}",
|
||||
"vcs.merge.theirs": "Merged branch",
|
||||
"vcs.merge.titleAbort": "Abort merge",
|
||||
"vcs.merge.titleConflicts": "Merge conflicts",
|
||||
"vcs.merge.titleMerge": "Merge a branch",
|
||||
"vcs.merge.titleMergeInto": "Merge into {branch}",
|
||||
"vcs.merge.titleResolve": "Resolve {path}",
|
||||
"vcs.merge.tooLarge": "The file is too large to merge here. Put the version you want on disk, then mark it resolved.",
|
||||
"vcs.merge.toolbar": "Conflict actions",
|
||||
"vcs.remote.cancel": "Cancel the Git operation",
|
||||
"vcs.remote.operation.clone": "Cloning",
|
||||
"vcs.remote.operation.fetch": "Fetching",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue