Resolve an active Git merge, rebase, or cherry-pick conflict while preserving both sides' intent and validating the resolution.
