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

move submodule entry to a place where it will not conflict #639

Merged
merged 1 commit into from
May 21, 2024

Conversation

tshepang
Copy link
Member

An upstream change resulted in a conflict,
due to rust-lang/rust#125166.

An upstream change resulted in a conflict,
due to rust-lang/rust#125166.
Copy link
Member

@pietroalbini pietroalbini left a comment

Choose a reason for hiding this comment

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

bors merge

@bors-ferrocene
Copy link
Contributor

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@bors-ferrocene
Copy link
Contributor

Build succeeded:

  • full

@bors-ferrocene bors-ferrocene bot merged commit 6f132f8 into main May 21, 2024
3 checks passed
@bors-ferrocene bors-ferrocene bot deleted the tshepang-avoid-submodule-conflict branch May 21, 2024 16:08
@github-actions github-actions bot added the backport:maybe PR candidate for backport label May 21, 2024
@pietroalbini pietroalbini removed the backport:maybe PR candidate for backport label Jul 8, 2024
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.

2 participants