Resolving Merge Conflicts guides an agent through handling an in-progress git merge or rebase conflict safely and methodically. It instructs the agent to inspect the current state, trace the primary sources and intent behind each change, resolve hunks carefully, run automated project checks, and finish by staging and committing. Reach for it whenever an agent encounters an active merge or rebase conflict that requires careful intent preservation and verification.