Skip to content

fix(generator-cli): remove leftover merge conflict markers in versions.yml#16467

Merged
fern-support merged 2 commits into
mainfrom
devin/1781147152-fix-versions-yml
Jun 11, 2026
Merged

fix(generator-cli): remove leftover merge conflict markers in versions.yml#16467
fern-support merged 2 commits into
mainfrom
devin/1781147152-fix-versions-yml

Conversation

@tstanmay13

Copy link
Copy Markdown
Contributor

Description

#16444 accidentally left rebase conflict markers (|||||||/=======/>>>>>>>) and a duplicated changelog block in packages/generator-cli/versions.yml. This broke YAML parsing in the Publish Generator CLI workflow'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 entry
  • Verified the file parses with js-yaml locally
  • Updated README.md generator (not applicable)

Testing

  • Manual testing completed: js-yaml load succeeds; no conflict markers remain (grep clean)
  • Unit tests added/updated (n/a — data file fix)

Link to Devin session: https://app.devin.ai/sessions/ebae597e588c4fecb8f3802f05617c2a
Requested by: @tstanmay13

…s.yml

Co-Authored-By: tanmay.singh <tstanmay13@gmail.com>
@devin-ai-integration

Copy link
Copy Markdown
Contributor

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment, CI, and merge conflict monitoring

@fern-support fern-support enabled auto-merge (squash) June 11, 2026 03:55
@fern-support fern-support merged commit e691f04 into main Jun 11, 2026
62 checks passed
@fern-support fern-support deleted the devin/1781147152-fix-versions-yml branch June 11, 2026 04:15
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.

2 participants