Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix changelog note section #2525

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Fix changelog note section #2525

merged 1 commit into from
Oct 4, 2024

Conversation

henrymercer
Copy link
Contributor

@henrymercer henrymercer commented Oct 4, 2024 •
edited
Loading

This went into the wrong place due to a semantic merge conflict.

Merge / deployment checklist

  • Confirm this change is backwards compatible with existing workflows.
  • Confirm the readme has been updated if necessary.
  • Confirm the changelog has been updated if necessary.

@henrymercer
Fix changelog note section
6c8758f 
This went into the wrong place due to a semantic merge conflict
@henrymercer henrymercer requested a review from a team as a code owner October 4, 2024 14:43
aeisenberg
aeisenberg approved these changes Oct 4, 2024
View reviewed changes
Copy link
Contributor

@aeisenberg aeisenberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to happen a lot. I'm not sure if there's a way around this (other than to check more carefully when we merge changelog notes).

@henrymercer
Copy link
Contributor Author

henrymercer commented Oct 4, 2024 •
edited
Loading

Yeah, I think it might be worth adopting the unreleased-changelog-notes concept from the CLI.

What's particularly annoying is that the diff looks fine since it's based on the merge base. You have to manually merge in main to see that there's an issue.

I've created an internal issue.

@henrymercer henrymercer merged commit 215ff9c into main Oct 4, 2024
277 checks passed
@henrymercer henrymercer deleted the henrymercer/fix-changelog-section branch October 4, 2024 17:15
@angelapwen
Copy link
Contributor

Thanks for catching this 🤦

This was referenced Oct 7, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aeisenberg aeisenberg aeisenberg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@henrymercer @angelapwen @aeisenberg