From 71edb1b99a3080e227e41c21b723f3f4ea614cca Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 3 Jul 2017 01:57:26 -0400 Subject: [PATCH] Stops error message with stash apply conflict --- src/commands/stashApply.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/commands/stashApply.ts b/src/commands/stashApply.ts index 36159e7..007355a 100644 --- a/src/commands/stashApply.ts +++ b/src/commands/stashApply.ts @@ -70,7 +70,10 @@ export class StashApplyCommand extends Command { catch (ex) { Logger.error(ex, 'StashApplyCommand'); if (ex.message.includes('Your local changes to the following files would be overwritten by merge')) { - return window.showErrorMessage(`Unable to apply stash. Your working tree changes would be overwritten.`); + return window.showWarningMessage(`Unable to apply stash. Your working tree changes would be overwritten.`); + } + else if (ex.message.includes('Auto-merging') && ex.message.includes('CONFLICT')) { + return window.showInformationMessage(`Stash applied with conflicts`); } else { return window.showErrorMessage(`Unable to apply stash. See output channel for more details`);