FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

馃懛 Detect and label merge conflicts on PRs automatically by svlandeg 路 Pull Request #1552 路 fastapi/sqlmodel 路 GitHub

  1. fastapi
  2. sqlmodel

Repository navigation

馃懛 Detect and label merge conflicts on PRs automatically - #1552

Merged
tiangolo merged 1 commit into
fastapi:mainfrom
svlandeg:feature/conflict
Sep 5, 2025
ConversationCommits聽(1)ChecksFiles changed
Merged

馃懛 Detect and label merge conflicts on PRs automatically#1552
tiangolo merged 1 commit into
fastapi:mainfrom
svlandeg:feature/conflict

Conversation

svlandeg commented Sep 5, 2025

Copy link
Copy Markdown
Member
  • 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)

github-actions Bot added the internal Internal changes label Sep 5, 2025
tiangolo approved these changes Sep 5, 2025
View reviewed changes

tiangolo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

馃殌

tiangolo merged commit 3b1b70c into fastapi:main Sep 5, 2025
26 checks passed
svlandeg deleted the feature/conflict branch September 5, 2025 08:39
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

tiangolo tiangolo approved these changes

Assignees

No one assigned

Labels

internal Internal changes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

Back | FazBrowse Home | New Git URL