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

Remove automatic conflict resolution for merge from release branch #4362

Merged
merged 1 commit into from
Jun 16, 2023
Merged

Remove automatic conflict resolution for merge from release branch #4362

merged 1 commit into from
Jun 16, 2023

Conversation

frangio
Copy link
Contributor

@frangio frangio commented Jun 16, 2023

Replaces #4353.

@frangio frangio requested a review from ernestognw June 16, 2023 18:39
@changeset-bot
Copy link

changeset-bot bot commented Jun 16, 2023

⚠️ No Changeset found

Latest commit: 4a9f4c5

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@frangio frangio mentioned this pull request Jun 16, 2023
Closed
ernestognw
ernestognw approved these changes Jun 16, 2023
View reviewed changes
Copy link
Member

@ernestognw ernestognw left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@frangio frangio merged commit 002a7c8 into OpenZeppelin:master Jun 16, 2023
15 of 16 checks passed
@frangio frangio deleted the remove-merge-back-resolution branch June 16, 2023 18:42
frangio added a commit that referenced this pull request Jun 16, 2023
@frangio
Remove automatic conflict resolution for merge from release branch (#…
f03420b 
…4362)

(cherry picked from commit 002a7c8)
@ernestognw ernestognw mentioned this pull request Jun 16, 2023
Closed
@cameel cameel mentioned this pull request Jun 21, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ernestognw ernestognw ernestognw approved these changes

Assignees
No one assigned
Labels
ignore-changeset
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@frangio @ernestognw