resolving-merge-conflicts

This skill is a concise, procedural guide (written in Chinese) for resolving in-progress git merge or rebase conflicts. It addresses the common and error-prone situation where a developer is mid-merge or mid-rebase with conflicting hunks and needs a disciplined process to reconcile changes correctly rather than guessing or aborting.

The workflow is a five-step checklist: first inspect the current merge or rebase state, git history, and the conflicted files; second, find the primary source for each conflict by understanding why each change was made, reading commit messages, and checking the associated PRs and issues; third, resolve each hunk while preserving both sides' intent where possible, choosing the side that matches the merge goal and documenting the trade-off when they are incompatible, without inventing new behavior and without using --abort; fourth, discover and run the project's automated checks such as typecheck, tests, and formatting, and fix any problems the merge introduced; and fifth, complete the merge or rebase by staging everything, committing, and continuing the rebase until all commits are applied.

The target users are software engineers and AI coding agents that need a reliable, intent-preserving method for finishing a conflicted merge or rebase. Because it is a short methodology document with no bundled code beyond an empty agents configuration file, it functions primarily as a workflow reference rather than an automated tool.