fix: gracefully handle merge conflicts in main to feature branches action (#77)

Author: 0marperez

.github/actions/merge-main/action.yml

@@ -86,19 +86,25 @@ runs:
             return
           fi
 
+          failed="false"
+
           for branch in "${branches[@]}"; do
             echo "...switching to branch: $branch"
             git switch "$branch"
             echo "...merging main"
-            git merge -m "misc: merge from main" origin/main
-            if [ $? -eq 0 ]; then
+            if git merge -m "misc: merge from main" origin/main; then
               echo "...pushing to origin"
               git push origin "$branch"
             else
               echo "...merge failed"
+              failed="true"
               git merge --abort
             fi
           done
+          
+          if [ "$failed" == "true" ]; then
+            exit 1
+          fi
         }
 
         merge_main