Skip to content

Conversation

@svlandeg
Copy link
Member

@svlandeg svlandeg commented Sep 5, 2025

  • Label a PR that has merge conflicts with the new label "conflicts"
  • Add a comment to the PR to alert the original poster & any subscribers to the thread
  • Remove the label again when the conflict is resolved (but add no further comment)
Copy link
Member

@tiangolo tiangolo left a comment

Choose a reason for hiding this comment

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

🚀

@tiangolo tiangolo merged commit 3b1b70c into fastapi:main Sep 5, 2025
26 checks passed
@svlandeg svlandeg deleted the feature/conflict branch September 5, 2025 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants