Skip to content

Add auto-propagate workflow for deployment branches#171

Merged
chriscarrollsmith merged 1 commit into
mainfrom
169-auto-propagate-changes-from-main-to-modal-and-hetzner-branches
Mar 14, 2026
Merged

Add auto-propagate workflow for deployment branches#171
chriscarrollsmith merged 1 commit into
mainfrom
169-auto-propagate-changes-from-main-to-modal-and-hetzner-branches

Conversation

@chriscarrollsmith

Copy link
Copy Markdown
Contributor

Summary

  • Adds a GitHub Actions workflow that automatically merges main into modal and hetzner deployment branches on every push
  • If merge conflicts arise, opens a PR instead so they can be resolved manually
  • Uses the existing GitHub App token for authentication

Test plan

  • Merge this PR and verify the propagate workflow runs
  • Confirm both modal and hetzner branches receive the latest main changes
  • Optionally introduce a deliberate conflict on a deployment branch to verify the fallback PR creation works

Closes #169

🤖 Generated with Claude Code

Merges main into modal and hetzner on every push. Opens a PR
instead when there are merge conflicts.

Closes #169

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@chriscarrollsmith chriscarrollsmith merged commit a397335 into main Mar 14, 2026
2 checks passed
@chriscarrollsmith chriscarrollsmith deleted the 169-auto-propagate-changes-from-main-to-modal-and-hetzner-branches branch March 14, 2026 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Auto-propagate changes from main to modal and hetzner branches

1 participant