Name: Fix Merge Conflicts
Author: shirhatti

Workflow

Run git status to list all files with conflicts
For each conflicted file: a. Read the file and identify all <<<<<<<, =======, >>>>>>> conflict markers b. Understand what each side (HEAD vs incoming) is trying to accomplish c. Resolve the conflict by combining or choosing the correct version d. Remove all conflict markers
After resolving all files, run git add <files> to mark them resolved
If in a rebase, run git rebase --continue; if in a merge, run git commit

Resolution Strategy

Favor semantic correctness over mechanical combination — understand what each side intended
Prefer the incoming change when it is a refactor or rename that HEAD hasn't caught up with
Prefer HEAD when the incoming change accidentally reverts a recent fix
Merge both when each side adds something independent (e.g. new imports, new fields)

Run git status to list all files with conflicts
For each conflicted file: a. Read the file and identify all <<<<<<<, =======, >>>>>>> conflict markers b. Understand what each side (HEAD vs incoming) is trying to accomplish c. Resolve the conflict by combining or choosing the correct version d. Remove all conflict markers
After resolving all files, run git add <files> to mark them resolved
If in a rebase, run git rebase --continue; if in a merge, run git commit

Favor semantic correctness over mechanical combination — understand what each side intended
Prefer the incoming change when it is a refactor or rename that HEAD hasn't caught up with
Prefer HEAD when the incoming change accidentally reverts a recent fix
Merge both when each side adds something independent (e.g. new imports, new fields)