From 209f716b5bbc88dc89a33bbefecb9c6a818779f3 Mon Sep 17 00:00:00 2001 From: Himanshu Shivhare Date: Thu, 11 Jan 2024 14:13:18 +0530 Subject: [PATCH] chore: fix typo (#1517) --- bench/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bench/app.py b/bench/app.py index f07251e4..4f74a153 100755 --- a/bench/app.py +++ b/bench/app.py @@ -621,9 +621,9 @@ Cannot proceed with update: You have local changes in app "{app}" that are not c Here are your choices: 1. Merge the {app} app manually with "git pull" / "git pull --rebase" and fix conflicts. -1. Temporarily remove your changes with "git stash" or discard them completely +2. Temporarily remove your changes with "git stash" or discard them completely with "bench update --reset" or for individual repositries "git reset --hard" -2. If your changes are helpful for others, send in a pull request via GitHub and +3. If your changes are helpful for others, send in a pull request via GitHub and wait for them to be merged in the core.""" ) sys.exit(1)