fix(generator-cli): remove leftover merge conflict markers in versions.yml#16467
Merged
Conversation
…s.yml Co-Authored-By: tanmay.singh <tstanmay13@gmail.com>
Contributor
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
fern-support
approved these changes
Jun 11, 2026
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
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.
Description
#16444 accidentally left rebase conflict markers (
|||||||/=======/>>>>>>>) and a duplicated changelog block inpackages/generator-cli/versions.yml. This broke YAML parsing in thePublish Generator CLIworkflow's check-version step, so the 0.9.38 publish from the #16444 merge failed (run 27320288027:YAMLException: end of the stream or a document separator is expected (29:1)).This removes the markers and the duplicated entry; the file now contains the intended history: 0.9.38 (replay 0.18.0 bump), 0.9.37, 0.9.36, ... Merging this should retrigger the publish and ship generator-cli 0.9.38.
Changes Made
packages/generator-cli/versions.yml: deleted 16 lines of leftover conflict markers + duplicated 0.9.37-numbered copy of the replay bump entryjs-yamllocallyTesting
js-yamlload succeeds; no conflict markers remain (grepclean)Link to Devin session: https://app.devin.ai/sessions/ebae597e588c4fecb8f3802f05617c2a
Requested by: @tstanmay13