Skip to content

Remove an extraneous commit during the release process #1065

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
Merged
merged 1 commit into from
May 11, 2022
Merged

Remove an extraneous commit during the release process #1065

merged 1 commit into from
May 11, 2022

Conversation

@henrymercer
Copy link
Contributor

@henrymercer henrymercer commented May 11, 2022

We only need to run git commit after the git merge call if there were conflicts.

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
Remove an extraneous commit during the release process
3bb6c41 
We only need to run `git commit` after the `git merge` call if there were conflicts.
@henrymercer henrymercer requested a review from a team as a code owner May 11, 2022 09:50
@henrymercer henrymercer enabled auto-merge May 11, 2022 09:54
@henrymercer henrymercer merged commit 03e2e3c into releases/v2 May 11, 2022
@henrymercer henrymercer deleted the henrymercer/remove-extraneous-commit branch May 11, 2022 10:39
This was referenced May 11, 2022
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@edoardopirovano edoardopirovano edoardopirovano approved these changes

Reviewers whose approvals may not affect merge requirements

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 @edoardopirovano