Skip to content

shape-doctor.py: a conflicted shape pin's NEXT takes whole every copy both sides hold as the standard wrote it at their own pin, and a leg pin put back from before its bump says to commit it and run the pins row's bump-leg.py line (#547) #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettheap merged 3 commits into from
Oct 15, 2026
Merged

shape-doctor.py: a conflicted shape pin's NEXT takes whole every copy both sides hold as the standard wrote it at their own pin, and a leg pin put back from before its bump says to commit it and run the pins row's bump-leg.py line (#547) #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5248e70
shape-doctor.py: a conflicted shape pin's NEXT takes whole, beside th…
Oct 15, 2026
2ca4044
shape-doctor.py: a conflicted copy whose two sides hold different mod…
Oct 15, 2026
8d3dadb
Merge main 2bf8fd4c into fix/doctor-pin-restore-merges (#586), a clea…
Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading