From 2a96848ed444454eb30adb1b1943a70c0074f071 Mon Sep 17 00:00:00 2001 From: Marc Kassay Date: Thu, 25 May 2017 22:35:00 -0400 Subject: [PATCH 1/3] Fixes issue when Git has an 'ADD/ADD' conflict after a merge --- extensions/git/src/commands.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index eed354dd8a4..546907082b7 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -187,6 +187,7 @@ export class CommandCenter { return resource.resourceUri; + case Status.BOTH_ADDED: case Status.BOTH_MODIFIED: return resource.resourceUri; } @@ -198,6 +199,7 @@ export class CommandCenter { switch (resource.type) { case Status.INDEX_MODIFIED: case Status.INDEX_RENAMED: + case Status.BOTH_ADDED: return `${basename} (Index)`; case Status.MODIFIED: From 996ced6016a7246698aae5d835ef48cd68b3a7e3 Mon Sep 17 00:00:00 2001 From: Marc Kassay Date: Fri, 26 May 2017 08:37:32 -0400 Subject: [PATCH 2/3] Fixes issue when Git has a 'Modify/Delete' conflict after a merge --- extensions/git/src/commands.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 546907082b7..070344edd90 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -160,6 +160,9 @@ export class CommandCenter { case Status.MODIFIED: return toGitUri(resource.resourceUri, '~'); + + case Status.DELETED_BY_THEM: + return toGitUri(resource.resourceUri, ''); } } @@ -172,6 +175,7 @@ export class CommandCenter { return toGitUri(resource.resourceUri, ''); case Status.INDEX_DELETED: + case Status.DELETED_BY_THEM: case Status.DELETED: return toGitUri(resource.resourceUri, 'HEAD'); From b7b818e8f2044a7e188034087cc4c780efae77f4 Mon Sep 17 00:00:00 2001 From: Marc Kassay Date: Thu, 1 Jun 2017 13:00:11 -0400 Subject: [PATCH 3/3] Updated title for merge conflicts --- extensions/git/src/commands.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 070344edd90..5886632fbe2 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -203,10 +203,12 @@ export class CommandCenter { switch (resource.type) { case Status.INDEX_MODIFIED: case Status.INDEX_RENAMED: - case Status.BOTH_ADDED: + case Status.DELETED_BY_THEM: return `${basename} (Index)`; case Status.MODIFIED: + case Status.BOTH_ADDED: + case Status.BOTH_MODIFIED: return `${basename} (Working Tree)`; }