fix: gracefully handle merge conflicts in main to feature branches action

Author: 0marperez

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

@@ -90,8 +90,7 @@ runs:
             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