Skip to content

internal: VS Code: report conflict with panicbit.cargo #16416

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 4 commits into from
Feb 1, 2024
Merged

internal: VS Code: report conflict with panicbit.cargo #16416

merged 4 commits into from
Feb 1, 2024

Conversation

@Young-Flash
Copy link
Member

@Young-Flash Young-Flash commented Jan 22, 2024 •
edited
Loading

notification

related to #16392

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 22, 2024
davidbarsky
davidbarsky reviewed Jan 25, 2024
View reviewed changes
Veykril
Veykril reviewed Jan 29, 2024
View reviewed changes
@Veykril Veykril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2024
@lnicola lnicola mentioned this pull request Jan 29, 2024
Open
lnicola
lnicola reviewed Jan 29, 2024
View reviewed changes
@Young-Flash
Copy link
Member Author

Young-Flash commented Jan 31, 2024

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 31, 2024
lnicola
lnicola reviewed Jan 31, 2024
View reviewed changes
lnicola
lnicola reviewed Jan 31, 2024
View reviewed changes
@lnicola
Copy link
Member

lnicola commented Jan 31, 2024

@bors delegate+

@bors
Copy link
Contributor

bors commented Jan 31, 2024

✌️ @Young-Flash, you can now approve this pull request!

If @lnicola told you to "r=me" after making some further change, please make that change, then do @bors r=@lnicola

@lnicola lnicola changed the title feat: add conflict ext (panicbit.cargo) detect internal: VS Code: report conflict with panicbit.cargo Jan 31, 2024
@lnicola
Copy link
Member

lnicola commented Feb 1, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Feb 1, 2024

📌 Commit 4facb62 has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 1, 2024

⌛ Testing commit 4facb62 with merge 135a8d9...

@bors
Copy link
Contributor

bors commented Feb 1, 2024

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 135a8d9 to master...

@bors bors merged commit 135a8d9 into rust-lang:master Feb 1, 2024
@Young-Flash Young-Flash deleted the cargo_ext_detect branch February 1, 2024 13:11
This was referenced May 9, 2024
Closed
Closed
Closed
This was referenced May 13, 2024
Closed
Merged
This was referenced May 28, 2024
Merged
Closed
Closed
Closed
Merged
@philips-software-forest-releaser philips-software-forest-releaser bot mentioned this pull request Jun 4, 2024
Merged
This was referenced Jun 11, 2024
Merged
Merged
@philips-software-forest-releaser philips-software-forest-releaser bot mentioned this pull request Jun 18, 2024
Merged
@philips-software-forest-releaser philips-software-forest-releaser bot mentioned this pull request Jun 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidbarsky davidbarsky davidbarsky left review comments

@Veykril Veykril Veykril left review comments

@lnicola lnicola lnicola approved these changes

Assignees

No one assigned

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Young-Flash @lnicola @bors @davidbarsky @Veykril @rustbot