Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 18, 2025
Merged

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

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1567add
fix: gracefully handle merge conflicts in main to feature branches ac…
0marperez Mar 18, 2025
7247b99
misc: run test
0marperez Mar 18, 2025
5702b7d
fix: rename step
0marperez Mar 18, 2025
7acec72
feat: fail action on failed merge
0marperez Mar 18, 2025
c7945f5
fix: use correct exit code
0marperez Mar 18, 2025
eec2744
fix: clean diff
0marperez Mar 18, 2025
40bd2cd
misc: sign last commit
0marperez Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/actions/merge-main/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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