Repository navigation
fix: remove merge-conflict markers committed to ground_truth.json and .gitignore - #37
Merged
Merged
Conversation
… .gitignore The merge of #36 (98bd424) committed unresolved conflict markers in data/ground_truth.json and .gitignore. The JSON file no longer parsed, so every test module that loads the ground truth failed at collection and CI on main went red (run 35344034148). Both files are restored to their state before the merge (468b759). Nothing is lost: the .gitignore conflict had an empty incoming side, and the ground-truth conflict duplicated coefficient lines that already exist above it.
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
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.
Main's CI is failing since the merge of #36 (98bd424):
data/ground_truth.jsonand.gitignorecontain unresolved conflict markers (<<<<<<< HEAD/>>>>>>>). The JSON file no longer parses, so six test modules error at collection on both Python versions (run 35344034148).This restores both files to their pre-merge state (468b759). Nothing from #36 is lost: the
.gitignoreconflict had an empty incoming side, and the ground-truth conflict only duplicated coefficient lines that already exist in the file.Fast suite locally after the fix: 111 passed, 4 deselected.