Take a contributor's pull request that cannot be merged as-is — usually a conflict with main — resolve the blocker without rewriting their commits, and merge it with a merge commit so their authorship survives. Detects the case where the conflict exists…
원문 언어: 영어