SBPro 4861179c6f Fix linearize fallback for already-applied merge commits ...

When cherry-pick -m 1 fails because the merge's changes were already
applied by a prior cherry-pick (empty result, clean working tree),
skip the commit instead of trying git-apply which also fails. Only
use the diff-from-first-parent fallback for real conflicts.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-03-17 14:49:10 +03:00

21 KiB

Raw Blame History

View Raw