Repository navigation
Catch conflict markers left by cruft update - #17
Merged
Merged
Conversation
check-merge-conflict only looks while a git merge is in progress, and cruft update applies its patch outside one, so leftover markers were committed unnoticed. Also indent .cruft.json as cruft writes it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Vtrv52oTpCLDMKzN13i4Nw
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
check-merge-conflictonly looks for conflict markers while a git merge is in progress.cruft updateapplies its patch withgit apply -3, outside any merge, so markers it leaves were committed unnoticed, despite the template README saying pre-commit refuses them.--assume-in-mergemakes the hook always look. Checked on a rendered project: a staged file with markers fails with the flag and passes without it.Also sets
.cruft.jsonto the 2-space indent cruft writes it with. sinkhorn_embeddings_analysis already had both, which is how this surfaced.🤖 Generated with Claude Code