Safely resolve all conflicts in an in-progress Git rebase or merge while preserving the target branch's current structure and reapplying the incoming change's intent. Use when Git stops on conflicts; when the user says "resolve conflicts", "resolve conflict", or "fix the rebase"; or when the user invokes /resolve-conflict or /resolve-conflicts, optionally with a target branch such as "on dev" or "dev".
