try origin/main

Author: 0marperez

.github/scripts/merge-main.sh

@@ -69,7 +69,7 @@ function merge_main() {
     echo "...switching to branch: $branch"
     git switch "$branch"
     echo "...merging main"
-    git merge -m "misc: merge from main" main
+    git merge -m "misc: merge from main" origin/main
     if [ $? -eq 0 ]; then
       echo "...pushing to origin"
 #      git push origin "$branch"