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 master import conflict #11203

Merged
merged 1 commit into from
Dec 21, 2021
Merged

Fix master import conflict #11203

merged 1 commit into from
Dec 21, 2021

Conversation

carmocca
Copy link
Contributor

@carmocca carmocca commented Dec 21, 2021 •
edited by ananthsub
Loading

What does this PR do?

Master's imports are currently broken 🚨🚨🚨
Part of #10549

Does your PR introduce any breaking changes? If yes, please list them.

None

Before submitting

  • [n/a] Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • [n/a] Did you make sure to update the documentation with your changes? (if necessary)
  • [n/a] Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

cc @tchaton @carmocca @akihironitta @Borda

@carmocca carmocca added priority: 0 High priority task ci Continuous Integration labels Dec 21, 2021
@carmocca carmocca added this to the 1.6 milestone Dec 21, 2021
@carmocca carmocca self-assigned this Dec 21, 2021
@github-actions
Copy link
Contributor

Build Error! No Linked Issue found. Please link an issue or mention it in the body using #<issue_id>

@github-actions
Copy link
Contributor

Build Error! No Linked Issue found. Please link an issue or mention it in the body using #<issue_id>

@carmocca carmocca enabled auto-merge (squash) December 21, 2021 18:20
rohitgr7
rohitgr7 approved these changes Dec 21, 2021
View reviewed changes
Copy link
Contributor

@rohitgr7 rohitgr7 left a comment

Choose a reason for hiding this comment

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

thanks for finding this!! was wondering why this is coming up locally.

@mergify mergify bot added the ready PRs ready to be merged label Dec 21, 2021
@carmocca carmocca merged commit b2c3d01 into master Dec 21, 2021
@carmocca carmocca deleted the ci/fix-master-import branch December 21, 2021 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitgr7 rohitgr7 rohitgr7 approved these changes

@akihironitta akihironitta akihironitta approved these changes

@awaelchli awaelchli awaelchli approved these changes

@ananthsub ananthsub ananthsub approved these changes

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

Assignees

@carmocca carmocca

Labels
ci Continuous Integration priority: 0 High priority task ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.6
Development

Successfully merging this pull request may close these issues.
5 participants
@carmocca @ananthsub @awaelchli @akihironitta @rohitgr7