Skip to content

Commit 5eeab37

Browse files
committed
only check for conflicts, not changes. #89776
1 parent 92da589 commit 5eeab37

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/vs/workbench/services/bulkEdit/browser/conflicts.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ export class ConflictDetector {
113113

114114
list(): URI[] {
115115
const result: URI[] = this._conflicts.keys();
116-
this._changes.forEach((_value, key) => {
117-
if (!this._conflicts.has(key)) {
118-
result.push(key);
119-
}
120-
});
116+
// this._changes.forEach((_value, key) => {
117+
// if (!this._conflicts.has(key)) {
118+
// result.push(key);
119+
// }
120+
// });
121121
return result;
122122
}
123123
}

0 commit comments

Comments
 (0)