Skip to content

chore(T-36): add PR rebase workflow with AI conflict resolution#89

Open
raschmitt wants to merge 4 commits into
mainfrom
chore/pr-rebase-workflow
Open

chore(T-36): add PR rebase workflow with AI conflict resolution#89
raschmitt wants to merge 4 commits into
mainfrom
chore/pr-rebase-workflow

Conversation

@raschmitt
Copy link
Copy Markdown
Owner

Task/Issue

T-36 · PR rebase workflow

What?

  • Create .agents/skills/pr-rebase/SKILL.md with instructions for fetching PR branch, rebasing onto main, resolving conflicts with AI, and force-pushing with lease
  • Create .github/workflows/pr-rebase.yml — thin workflow_dispatch wrapper accepting a pr_number input and calling the pr-rebase skill via opencode/big-pickle
  • Handle no-conflict case: skip AI resolution and push directly
  • Handle failed AI resolution: post a comment on the PR listing unresolvable files

Why?

  • Developers need a way to rebase stale PR branches without manual intervention
  • AI conflict resolution reduces friction by intelligently merging both sides of a conflict
  • Protected config files (e.g. .github/workflows/) should always prefer the main branch version during rebase conflicts

@raschmitt
Copy link
Copy Markdown
Owner Author

🤖 This PR was automatically generated by the auto-implement workflow using OpenCode CLI with the big-pickle model.

@chatgpt-codex-connector
Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@raschmitt
Copy link
Copy Markdown
Owner Author

raschmitt commented May 12, 2026

💡 AI Code Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6ac538da7a

ℹ️ About this review

This review was generated automatically by the AI Code Review workflow using OpenCode CLI with the Minimax M2.5 Free model.

Reviews are triggered on every pull request push.

Comment thread .agents/skills/pr-rebase/SKILL.md
Co-authored-by: claude <claude@anthropic.com>
Comment thread .agents/skills/pr-rebase/SKILL.md
Co-authored-by: claude <claude@anthropic.com>
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.

1 participant