Commit 5f8f88b
fix: resolve [fern-replay] conflict in management/__init__.py (#842)
## Summary
Resolves the unresolved \`patch-4894603d\` conflict surfaced by Replay
in #841. Adds one commit on top of \`fern-bot/2026-05-18_04-50-14_812\`
that re-applies the custom wiring in
\`src/auth0/management/__init__.py\` against the new generation output,
and updates \`.fern/replay.lock\` to reflect the resolution.
## What the conflict was
The new generation in #841 added new types (\`BadRequestSchema\`,
\`ForbiddenSchema\`, \`TooManyRequestsSchema\`, \`UnauthorizedSchema\`,
\`FlowsVaultConnectio*\`, \`CredentialDeviceTypeEnum\`) immediately
adjacent to the existing customer wiring entries
(\`AsyncManagementClient\`, \`AsyncTokenProvider\`,
\`ManagementClient\`, \`TokenProvider\`) in \`__init__.py\`'s sorted
\`_dynamic_imports\` dict and \`__all__\` list. The 3-way merge
correctly flagged this as a conflict — both sides added entries to the
same sorted regions.
\`fern replay resolve\` produced 7 conflict-marker regions. All 7 are
purely additive (one side's entries are a strict subset of the other;
the merged result is the union). No same-key replacements, no
overlapping changes.
## Resolution table
| Region | Line | Resolution | Reason |
|---|---|---|---|
| 1 | 84 | Took Generated side | Generator added \`BadRequestSchema\`,
\`BadRequestSchemaError\` |
| 2 | 1834 | Took Generated side | Generator added
\`FlowsVaultConnectio*\` types |
| 3 | 2875 | Took customer side | Preserves
\`AsyncManagementClient\`/\`AsyncTokenProvider\` wiring in
\`_dynamic_imports\` |
| 4 | 2913 | Took Generated side | Generator added
\`BadRequestSchema\`/\`BadRequestSchemaError\` keys |
| 5 | 5667 | Took customer side | Preserves
\`AsyncManagementClient\`/\`AsyncTokenProvider\` wiring in \`__all__\` |
| 6 | 5705 | Took Generated side | Generator added
\`BadRequestSchema\`/\`BadRequestSchemaError\` to \`__all__\` |
| 7 | 7915 | Took customer side | Preserves \`ManagementClient\` in
\`__all__\` |
After resolution, \`fern replay resolve\` Phase 2 finalized the commit
and updated the lockfile.
## Verification
After this PR merges into the \`fern-bot/2026-05-18_04-50-14_812\`
branch:
- All 11 customer-wiring entries are present in
\`src/auth0/management/__init__.py\` (imports, \`_dynamic_imports\`
keys, \`__all__\` entries)
- \`.fern/replay.lock\` no longer has any patch with \`status:
unresolved\` or \`status: resolving\`
- The \`[fern-replay] Resolved conflicts\` commit is classified by the
detector as a generation boundary, so future regens treat it correctly
- The diff vs master is now only the new generator-added types
(legitimate spec evolution), no missing wiring
## Once merged
The bot branch will reflect the resolved state. PR #841 then becomes a
clean merge into \`master\`.
Co-authored-by: Tanmay Singh <tstanmay13@gmail.com>1 parent 4cfd883 commit 5f8f88b
2 files changed
Lines changed: 63 additions & 6881 deletions
0 commit comments