development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

only check for conflicts, not changes. #89776

Browse source
This commit is contained in:
Johannes Rieken 2020-01-31 12:44:19 +01:00
parent 92da5890d8
commit 5eeab37a1e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/workbench/services/bulkEdit/browser/conflicts.ts
View file

@ -113,11 +113,11 @@ export class ConflictDetector {
list(): URI[] {
const result: URI[] = this._conflicts.keys();
this._changes.forEach((_value, key) => {
if (!this._conflicts.has(key)) {
result.push(key);
}
});
// this._changes.forEach((_value, key) => {
// if (!this._conflicts.has(key)) {
// result.push(key);
// }
// });
return result;
}
}