mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
only check for conflicts, not changes. #89776
This commit is contained in:
parent
92da5890d8
commit
5eeab37a1e
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue