Skip to content

Reject conflict resolutions that bring back lines the parent removed - #67

Draft
Phlogistique wants to merge 1 commit into
mainfrom
resume-require-old-base
Draft

Phlogistique wants to merge 1 commit into
mainfrom
resume-require-old-base

Commits

  1. Commits on Nov 3, 2026