Merge feature branches into main with conflict resolution and CI-aware auto-merge.
npx skills add https://github.com/jikig-ai/soleur --skill merge-pr-jikig-ai
Please help me install this Agent Skill. Skill: merge-pr Source: https://github.com/jikig-ai/soleur/tree/main/plugins/soleur/skills/merge-pr Command: npx skills add https://github.com/jikig-ai/soleur --skill merge-pr-jikig-ai
This Skill removes the manual friction and risk of merging a feature branch into main by automating pre-checks, conflict resolution, PR creation, CI-aware merging, and cleanup while preserving critical artifacts like the CHANGELOG.
Run the merge-pr skill on the current feature branch to merge origin/main, resolve conflicts per project rules, push the branch, create or detect the PR, queue auto-merge, and run cleanup.
High-intent search queries and answers about installing and using this skill.
Automating a feature branch merge involves fetching origin/main, routing file conflicts to specific resolution strategies like CHANGELOG reconstruction, creating a PR, and queuing CI-aware auto-merge. This process validates pre-conditions and handles worktree cleanup automatically.
Handling CHANGELOG conflicts during a git merge requires routing file-specific conflicts to deterministic reconstruction strategies. The merge process applies dedicated conflict resolution rules for critical artifacts like the CHANGELOG and README before proceeding with CI gating.
CI-aware auto-merge queuing works by pushing the feature branch, creating or detecting a PR, and polling CI checks for merge completion. If CI fails, the system reports failures and provides rollback instructions to restore the recorded starting SHA.
Yes, you can rollback a failed git merge and clean up worktrees deterministically. The process records the starting SHA before merging, allowing precise rollback if conflicts or CI failures occur, followed by centralized cleanup to remove worktrees and archived specs.
Automated conflict resolution for pull requests is limited by confidence levels; the process aborts on low confidence during Claude-assisted resolution. It is designed for single-feature branches and requires a clean working tree with archived compound artifacts before merging.
Yes, a clean working tree is required before automating a pull request merge. Pre-condition validation verifies branch cleanliness and ensures compound artifacts are archived, guaranteeing safe merges and enabling deterministic rollback to the starting SHA if needed.
klaaayRun tests and preserve the working tree when finishing a development branch.
catu-aiMerge an approved pull request after confirming an archived harness plan.
catlog22Merge session worktree branches into main and synchronize run artifacts.
CuriousLearnerAnalyze Git merge conflict types and propose automated or manual resolution strategies.
