push workaround for #157904 (#158368)

microsoft · Aug 17, 2022 · 9759525 · 9759525
1 parent 93005be
commit 9759525
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -938,7 +938,8 @@ export class Repository implements Disposable {
 
 		workspace.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('git.mergeEditor')) {
-				this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
+				// this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
+				this.status();
 			}
 		}, undefined, this.disposables);