roo-conflict-resolution

To resolve git merge conflicts using pull request context, the Skill fetches PR metadata like title and description to understand commit intent, then analyzes conflicted file sections and git blame to apply intent-based resolutions. It stages resolved files and validates that no conflict markers remain.

The best way to resolve rebase conflicts without losing changes is using history-aware comparison. The Skill inspects git blame and commit diffs to understand each side's intent, applies a resolution strategy matching that intent, and validates the code is syntactically correct before final staging.

Git blame analysis helps conflict resolution by extracting conflicted regions and inspecting commit history to determine what each overlapping code change tried to accomplish. This history-aware comparison guides intent-based resolution decisions instead of guessing which lines to keep.

Yes, you can resolve GitHub pull request conflicts for a specific PR number. The Skill parses the PR number, fetches PR metadata for intent context, prepares a deterministic rebase onto the target branch, and resolves overlapping code changes with validation.

No, resolving merge conflicts with intent-aware guidance does not require manual staging. The Skill automatically stages resolved files after applying the intent-based resolution strategy and performs final validation to ensure no conflict markers remain in the codebase.

A limitation of intent-based conflict resolution for git history is that it depends on accurate PR metadata and commit context. If the pull request title and description lack clear intent, the Skill's history-aware comparison may struggle to determine the correct resolution for overlapping changes.