Resolving-Conflict

Resolving Git merge conflicts involves identifying conflicting files, reviewing the conflict markers (<<<<<<, ======, >>>>>>), choosing which changes to keep, and completing the merge with git add and git commit. This Skill automates that process by listing conflicts, guiding you through each file, and finalizing the operation.

Merge conflicts occur when integrating branches with divergent changes; rebase conflicts occur when replaying commits onto a new base. Both produce conflict markers in files. This Skill handles both scenarios—it detects your current state, lists all conflicting files, and guides resolution before completing with either git commit or git rebase --continue.

This Skill structures conflict resolution by presenting each conflicting file and offering resolution options: accept ours (your changes), accept theirs (incoming changes), or integrate both manually. It guides you through each file sequentially and handles the git add and finalization commands automatically.

During a merge or rebase conflict state, Git marks conflicting files in your working directory. This Skill automatically detects the conflict state and lists all conflicting files so you can see exactly which ones need resolution before proceeding.

No. After you resolve each conflicting file, this Skill handles running git add on resolved files and executes git rebase --continue or git commit to finalize the operation, removing the need to run those commands separately.

This Skill processes multiple conflicting files systematically, revealing each conflict block within each file and guiding you through resolution one file at a time until the entire merge or rebase operation completes.