Skip to content

Merge to beta#3347

Merged
mbroshi-stripe merged 6 commits intobetafrom
mbroshi/merge-dotnet-beta
Mar 24, 2026
Merged

Merge to beta#3347
mbroshi-stripe merged 6 commits intobetafrom
mbroshi/merge-dotnet-beta

Conversation

@mbroshi-stripe
Copy link
Copy Markdown
Contributor

Why?

Routine merge of master changes into the beta release channel.

What?

Merged master into beta using sdk-codegen's automerge tooling (tools/automerge/dotnet-beta.yaml). All 12 conflicts were resolved automatically by automerge (generated code conflicts in Entities and Services).

See Also

N/A

Changelog

  • Merged latest master changes into the beta branch.

stripe-openapi Bot and others added 5 commits March 23, 2026 16:10
Co-authored-by: Stripe OpenAPI <105521251+stripe-openapi[bot]@users.noreply.github.com>
* Add errors when parsing the wrong kind of webhooks payload

* update error message
Committed-By-Agent: claude

# Conflicts:
#	src/Stripe.net/Entities/Subscriptions/Subscription.cs
#	src/Stripe.net/Services/Checkout/Sessions/SessionPaymentMethodOptionsPaypalOptions.cs
#	src/Stripe.net/Services/Checkout/Sessions/SessionUpdateOptions.cs
#	src/Stripe.net/Services/Invoices/InvoiceScheduleDetailsPhaseItemOptions.cs
#	src/Stripe.net/Services/Invoices/InvoiceScheduleDetailsPhaseOptions.cs
#	src/Stripe.net/Services/PaymentIntents/PaymentIntentPaymentDetailsOptions.cs
#	src/Stripe.net/Services/PaymentIntents/PaymentIntentPaymentMethodOptionsKlarnaOptions.cs
#	src/Stripe.net/Services/PaymentIntents/PaymentIntentPaymentMethodOptionsPaypalOptions.cs
#	src/Stripe.net/Services/SubscriptionItems/SubscriptionItemCreateOptions.cs
#	src/Stripe.net/Services/SubscriptionSchedules/SubscriptionSchedulePhaseItemOptions.cs
#	src/Stripe.net/Services/SubscriptionSchedules/SubscriptionSchedulePhaseOptions.cs
#	src/Stripe.net/Services/Subscriptions/SubscriptionItemOptions.cs
@mbroshi-stripe mbroshi-stripe requested a review from a team as a code owner March 24, 2026 23:08
@mbroshi-stripe mbroshi-stripe requested review from xavdid-stripe and removed request for a team March 24, 2026 23:08
@xavdid-stripe
Copy link
Copy Markdown
Contributor

build is failing - you may need to generate again. merging isn't enough (since net-new beta code doesn't appear until you generate)

Run `just gen dotnet --beta` to pick up IHasSetTracking changes
from master that were lost during automerge conflict resolution.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude
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.

3 participants