fix: resolve [fern-replay] conflict in management/__init__.py#842
Merged
developerkunal merged 1 commit intoMay 19, 2026
Conversation
developerkunal
merged commit 1bdc039
into
auth0:fern-bot/2026-05-18_04-50-14_812
3 of 7 checks passed
developerkunal
pushed a commit
that referenced
this pull request
May 20, 2026
## 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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
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:
Once merged
The bot branch will reflect the resolved state. PR #841 then becomes a clean merge into `master`.