Resolve conflicts: scalar-generated into scalar-next - #11
Merged
Conversation
- Regenerated with generator `0.20.1` (previously `0.19.6`). Build: GE6Bq0xCjrdRlSH2BrYqa
scalar-docs
Bot
force-pushed
the
scalar-merge-conflict
branch
from
July 28, 2026 22:28
db49264 to
f0b4ad6
Compare
2 generated files changed with no detected API surface change (documentation, examples, or file content). Build: G70fniT28d0PldguhdftX
scalar-docs
Bot
force-pushed
the
scalar-merge-conflict
branch
from
July 28, 2026 22:39
f0b4ad6 to
67b140b
Compare
2 generated files changed with no detected API surface change (documentation, examples, or file content). Build: 4FgjDb6FJKghIbodFAyrC
scalar-docs
Bot
force-pushed
the
scalar-merge-conflict
branch
from
July 28, 2026 22:47
67b140b to
a5cc3a9
Compare
Keep the released version 0.3.1 (0.1.0 is the generator placeholder), take the regenerated short description, and take the new readme field.
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
2 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.
The latest generated output on
scalar-generatedconflicts with the custom code onscalar-next(build4FgjDb6FJKghIbodFAyrC).Important
1 file conflicted — the regenerated output and your edits on
scalar-nextchanged overlapping regions (an edit next to a regenerated line is enough to collide):pyproject.tomlResolve the conflict markers on this branch, then merge this PR into
scalar-next. The platform will not touch this branch while your resolution is in progress.Note
Prefer Create a merge commit when merging. Squash or rebase merges drop the merge ancestry; the platform detects and repairs that on the next generation, but a merge commit keeps the history exact.