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.

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

Clarify merging with merge commit #1291

Merged
merged 2 commits into from
Oct 7, 2022

Conversation

angelapwen
Copy link
Contributor

We want to add an explicit statement that merging release commits should not be squashed or rebased 😸

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.

@angelapwen angelapwen requested a review from a team as a code owner October 7, 2022 16:35
Copy link
Contributor

@henrymercer henrymercer left a comment

Choose a reason for hiding this comment

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

Looks good. Let's add instructions to the mergeback PR too — I think you want to update

- [ ] Approve and merge the PR.
.

@angelapwen angelapwen enabled auto-merge (squash) October 7, 2022 17:14
@angelapwen angelapwen merged commit c6c7d29 into main Oct 7, 2022
@angelapwen angelapwen deleted the angelapwen/update-release-automation branch October 7, 2022 19:05
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.

3 participants