feat: add PR conflict detection with system pins via GitHub App#48
Open
MrgSub wants to merge 1 commit intobetter-auth:mainfrom
Open
feat: add PR conflict detection with system pins via GitHub App#48MrgSub wants to merge 1 commit intobetter-auth:mainfrom
MrgSub wants to merge 1 commit intobetter-auth:mainfrom
Conversation
…oks + polling fallback Introduce server-side monitoring of open PRs for merge conflicts. When a conflict is detected, a repo-global system pin is created and surfaced in the maintainer dashboard. - Add GitHub App webhook endpoint handling installation lifecycle and pull_request events with signature verification and dedupe - Add conflict evaluator (Inngest) that checks mergeable_state with retry logic for GitHub's async mergeability computation - Add polling fallback (15min cron) for repos without app installation - Add RepoSystemPin, GitHubAppInstallation, GitHubAppInstallationRepo Prisma models with transition-based pin activation/clearing - Add ConflictPinsSection UI in repo overview for maintainers - Auth: installation tokens (primary), user OAuth fallback (polling)
|
@MrgSub is attempting to deploy a commit to the better-auth Team on Vercel. A member of the Team first needs to authorize it. |
|
|
Comment on lines
+67
to
+70
| # Secret for verifying GitHub webhook signatures | ||
| # Configure in your GitHub repo/org webhook settings | ||
| # Generate with: openssl rand -hex 20 | ||
| # GITHUB_WEBHOOK_SECRET=your_webhook_secret |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
webhooks + polling fallback
Introduce server-side monitoring of open PRs for merge conflicts. When a conflict is detected, a repo-global system pin is created and surfaced in the maintainer dashboard.