Skip to content

chore: update GitHub Action to automatically merge develop into open PRs #1273

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
janosbabik merged 1 commit into from
Nov 27, 2025
Merged

chore: update GitHub Action to automatically merge develop into open PRs #1273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions ...hub/workflows/rebase-prs-with-develop.yml → ...hub/workflows/update-prs-with-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rebase PRs with develop
name: Update PRs with develop

on:
push:
Expand All @@ -20,7 +20,7 @@ jobs:
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: Rebase all open non-Dependabots PRs with develop branch as base
- name: Merge develop into all open non-Dependabot PRs
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand All @@ -32,14 +32,14 @@ jobs:
gh pr checkout $pr
git fetch origin develop

# Attempt rebase
if git rebase origin/develop; then
echo "PR #$pr rebased successfully. Pushing changes..."
git push --force-with-lease
# Attempt merge
if git merge --no-edit origin/develop; then
echo "PR #$pr merged successfully. Pushing changes..."
git push
else
echo "Conflict in PR #$pr. Rebase aborted."
git rebase --abort
echo "Conflict in PR #$pr. Merge aborted."
git merge --abort
# Optional: Notify author
gh pr comment $pr --body "⚠️ Automatic rebase failed due to conflicts. Please rebase manually."
gh pr comment $pr --body "⚠️ Automatic merge of \`develop\` into this PR failed due to conflicts. Please resolve the conflicts and update your branch."
fi
done
Loading