git-conflict-resolve

Use this when code conflicts occur during Git merge or rebase. It is especially suited for scenarios where AI automatic conflict resolution often makes mistakes (picking the wrong side, losing refactorings, reverting to older code) and where semantic analysis and logical validation are required. It also applies when a rebase stops across multiple rounds and conflict files must be aggregated across rounds. Trigger words: resolve conflicts, handle conflicts, git-conflict-resolve, resolve merge conflicts, resolve rebase conflicts, conflict resolve, conflict resolution.