fix: don't use force in migrate script (#1217)

* fix: don't use force in migrate script * Update README.md
AztecProtocol · Jul 27, 2023 · a8edf9f · a8edf9f
1 parent a4be365
commit a8edf9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/l1-contracts/README.md b/l1-contracts/README.md
@@ -1,6 +1,6 @@
 # L1 Contracts
 
-This directory contains the Ethereum smart contract that we will be using for progressing the state of the Rollup.
+This directory contains the Ethereum smart contracts for progressing the state of the Rollup.
 
 ## Installation
 

diff --git a/scripts/migrate_barretenberg_branch.sh b/scripts/migrate_barretenberg_branch.sh
@@ -36,8 +36,7 @@ fi
 git checkout -b "$BRANCH"
 
 echo "(branch migrate) Pulling from upstream barretenberg repo. If this doesn't work, your barretenberg branch may need to merge barretenberg master."
-# note: we use force with the assumption that people don't care about their subrepo stash branch
-if ! scripts/git_subrepo.sh pull "$SUBREPO_PATH" --branch=$BRANCH --force; then
+if ! scripts/git_subrepo.sh pull "$SUBREPO_PATH" --branch=$BRANCH; then
     echo "Error: Failed to pull from upstream barretenberg repo. Check your branch name or network connection."
     exit 1
 fi