How does the skill decide which code change to keep during a conflict?

It uses a sequential thinking process to analyze the context and intent of both changes. It determines if they are independent, if one supersedes the other, or if they should be combined, only stopping for user input if the logic is truly ambiguous.

Is it safe to let an AI force-push to my repository?

The skill uses the --force-with-lease flag, which is a safer version of a force-push. It ensures that no remote work is overwritten if the branch has diverged in ways the skill hasn't accounted for.

Does this work with all package managers?

Yes, it intelligently detects the project's package manager by looking for lockfiles like bun.lockb, pnpm-lock.yaml, yarn.lock, or package-lock.json.

What happens if the code fails tests after the conflict is resolved?

The skill performs local verification (linting, type-checking, and tests) before pushing. If checks fail, it attempts to diagnose and fix the resolution or the code logic until the environment is stable.

Resolve Conflict

Name: Resolve Conflict
Author: drdanmaggs

bydrdanmaggs

0•

Developer Tools

Automates the entire git rebase and conflict resolution workflow using sequential thinking to intelligently merge changes and verify CI status.

The Resolve Conflict skill enables Claude to autonomously navigate complex git rebases by analyzing the semantic intent behind conflicting code blocks. Using sequential thinking, it evaluates 'ours' versus 'theirs' to determine the most logical resolution, only pausing for human intervention when a conflict is genuinely ambiguous. The skill manages the full lifecycle of a resolution: it rebases onto main, fixes conflicts, performs local verification through linting and testing, pushes changes via force-with-lease, and monitors CI pipelines until the PR is green and ready for merge.

Key Features

01Intelligent package manager detection for npm, pnpm, bun, and yarn

02Autonomous conflict resolution using sequential thinking to analyze code intent

03End-to-end rebase management from initial fetch to final force-push

04Automated local verification including linting, type-checking, and test suites

050 GitHub stars

06Continuous CI status polling to ensure build success post-resolution

Use Cases

01Automating the 'rebase and verify' loop for long-running feature branches

02Resolving complex merge conflicts on an active PR after the main branch has updated

03Fixing CI failures caused by semantic conflicts that simple git merges miss

Key Features

01Intelligent package manager detection for npm, pnpm, bun, and yarn

02Autonomous conflict resolution using sequential thinking to analyze code intent

03End-to-end rebase management from initial fetch to final force-push

04Automated local verification including linting, type-checking, and test suites

050 GitHub stars

06Continuous CI status polling to ensure build success post-resolution

Use Cases

01Automating the 'rebase and verify' loop for long-running feature branches

02Resolving complex merge conflicts on an active PR after the main branch has updated

03Fixing CI failures caused by semantic conflicts that simple git merges miss