resolve-conflict

To resolve git merge conflicts without losing work, you must read both sides of every conflict block before choosing a resolution. This process classifies conflicts as identical intent, complementary changes, or incompatible logic, stopping to ask for explicit input when edits cannot be safely merged automatically.

Handling lockfile conflicts during a git rebase requires regenerating the lockfile from source files instead of hand-merging the conflicting text. This ensures the generated asset is rebuilt correctly based on the resolved source dependencies and properly staged for the continuation of the rebase.

Semantic conflicts break behavior after a git merge resolution when source-level edits are combined in ways that are syntactically valid but functionally incompatible. Detecting these conflicts requires per-block reasoning to classify whether edits have complementary changes or incompatible logic that would otherwise break the application.

You can continue a git cherry-pick after resolving conflicts only when all unresolved markers are eliminated and the corrected files are staged. The completion workflow detects the active Git operation and continues the cherry-pick specifically after verifying that no incompatible blocks remain unaddressed.

Resolving generated file conflicts does not require manually editing the diff because the correct approach is to rebuild the generated outputs from their sources. Hand-merging generated assets is bypassed entirely by regenerating the files and staging the freshly built results.