Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/50252/head' of github.com:Microsoft/vscode into pr/50252

Browse Source
This commit is contained in:
Joao Moreno
2018-07-06 12:26:22 +02:00
parent c0cfa06328 325a919569
commit 8f6c6e8bc0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/git/src/commands.ts
View File

@@ -630,12 +630,13 @@ export class CommandCenter {
const selection = resourceStates.filter(s => s instanceof Resource) as Resource[];
const merge = selection.filter(s => s.resourceGroupType === ResourceGroupType.Merge);
const bothModified = merge.filter(s => s.type === Status.BOTH_MODIFIED);
const isBothAddedOrModified = (s: Resource) => s.type === Status.BOTH_MODIFIED || s.type === Status.BOTH_ADDED;
const bothModified = merge.filter(isBothAddedOrModified);
const promises = bothModified.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
const unresolvedBothModified = await Promise.all<boolean>(promises);
const resolvedConflicts = bothModified.filter((s, i) => !unresolvedBothModified[i]);
const unresolvedConflicts = [
...merge.filter(s => s.type !== Status.BOTH_MODIFIED),
...merge.filter(s => !isBothAddedOrModified(s)),
...bothModified.filter((s, i) => unresolvedBothModified[i])
];