We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent f8ba335 commit f1d4fceCopy full SHA for f1d4fce
src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
@@ -86,6 +86,10 @@ export class ConflictActionsFactory extends Disposable {
86
}
87
88
const items = derived('items', reader => {
89
+ if (!viewModel.model.hasBaseRange(modifiedBaseRange)) {
90
+ return [];
91
+ }
92
+
93
const state = viewModel.model.getState(modifiedBaseRange).read(reader);
94
const handled = viewModel.model.isHandled(modifiedBaseRange).read(reader);
95
const model = viewModel.model;
0 commit comments