Skip to content

Propagate main to stripe - #230

Merged
chriscarrollsmith merged 2 commits into
stripefrom
auto-merge/main-to-stripe-20260714213411
Jul 14, 2026
Merged

Propagate main to stripe#230
chriscarrollsmith merged 2 commits into
stripefrom
auto-merge/main-to-stripe-20260714213411

Conversation

@version-incrementer

Copy link
Copy Markdown
Contributor

Summary

  • Auto-generated PR to propagate changes from main to the deployment branch
  • Opened because an automatic merge had conflicts that need manual resolution

🤖 Generated by the propagate workflow

rafizamankhan and others added 2 commits July 14, 2026 17:34
* docs: document stripe branch and add propagate/CI support (#228)

Point main docs and README at the optional stripe branch, document the
merge recipe and conflict-prone files, and extend propagate.yml and
test.yml so stripe receives main updates and runs CI with dummy Stripe env.

Co-authored-by: Cursor <cursoragent@cursor.com>

* fix(ci): keep Test workflow push triggers unfiltered

Narrowing push to main/stripe would drop CI on feature branches and
modal/hetzner; only extend pull_request targets for stripe.

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: chriscarrollsmith <chriscarrollsmith@gmail.com>
@chriscarrollsmith
chriscarrollsmith merged commit d64803e into stripe Jul 14, 2026
2 checks passed
@chriscarrollsmith
chriscarrollsmith deleted the auto-merge/main-to-stripe-20260714213411 branch July 14, 2026 21:48
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.

2 participants