Surgical porting over full merge for heavily customized forks.
Surgical porting over full merge for heavily customized forks. Paperclip is 909 commits behind upstream with 110 modified + 22 untracked files. Full stash-forward merge rejected: 5 conflict files. Safe approach: manually port only zero-conflict, high-value code blocks. Criteria: (1) Fixes a real problem? (2) Additive (new function/file) or surgical (⇐5 line edits)? (3) Zero touchpoints with customized files? Three upgrades ported: activeRunExecutions Set (fixes false process_lost), resumeQueuedRuns (fixes stuck runs), log-redaction.ts (new file). Rule: Evaluate upstream changes individually. Additive always safer than modificative.