Skip to content

shape-doctor.py: a conflicted shape pin's NEXT takes the pin alone and gives a copy conflicted beside it to a person to merge by hand, so pasting it no longer drops an edit kept with --accept-local and then says COMPLIANT (#485) - #496

Merged
brettheap merged 26 commits into
mainfrom
fix/485-doctor-conflicted-pin-and-copy
Oct 13, 2026
Merged

shape-doctor.py: a conflicted shape pin's NEXT takes the pin alone and gives a copy conflicted beside it to a person to merge by hand, so pasting it no longer drops an edit kept with --accept-local and then says COMPLIANT (#485)#496
brettheap merged 26 commits into
mainfrom
fix/485-doctor-conflicted-pin-and-copy

Merge branch 'main' into fix/485-doctor-conflicted-pin-and-copy

85d3e1e
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar