fix mirror script

OWASP · May 8, 2023 · a14987c · a14987c
1 parent 40fc99c
commit a14987c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/utils/sync_mirror_repo.sh b/utils/sync_mirror_repo.sh
@@ -37,6 +37,8 @@ commit_and_push_changes() {
 sync_mirror_repo() {
   git checkout "${MAIN_BRANCH}"
 
+  git fetch --all
+  git pull --rebase origin "${MAIN_BRANCH}"
   git merge --strategy-option=theirs "${MIRROR_REMOTE}/${MAIN_BRANCH}"
   for src_file in "${FILES_NOT_IN_SYNC[@]}"
   do