ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-14 01:25:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Stops error message with stash apply conflict

Browse Source
This commit is contained in:
Eric Amodio
2017-07-03 01:57:26 -04:00
parent 7f3fdb48fd
commit 71edb1b99a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/commands/stashApply.ts
View File

@@ -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`);