Apply suggestions from code review

jupyterlab · Nov 11, 2021 · 1b6f5bd · 1b6f5bd
1 parent 2c7bbb7
commit 1b6f5bd
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/commandsAndMenu.tsx b/src/commandsAndMenu.tsx
@@ -398,7 +398,7 @@ export function addCommands(
     execute: async args => {
       try {
         if (args.discard) {
-          await discardAllChanges(gitModel, trans);
+          await discardAllChanges(gitModel, trans, args.fallback);
         }
         logger.log({
           level: Level.RUNNING,
@@ -430,8 +430,7 @@ export function addCommands(
               'your local changes to the following files would be overwritten by merge'
             )
         ) {
-          await discardAllChanges(gitModel, trans, true);
-          await commands.execute(CommandIDs.gitPull);
+          await commands.execute(CommandIDs.gitPull, {discard: true, fallback: true});
         } else {
           logger.log({
             message: trans.__('Failed to pull'),