Skip to content

REIC lab_id field fix - #48

Merged
Jacob-Shay merged 3 commits into
mainfrom
Schema-Updates
Sep 17, 2026
Merged

Jacob-Shay merged 3 commits into
mainfrom
Schema-Updates

Conversation

@Jacob-Shay

Copy link
Copy Markdown
Contributor

REIC_EXTRACTOR field lab_id was marked as "Parent" and should have been "Plain text". This might include a duplicate of the RRC processor update in PR #47.

@Jacob-Shay Jacob-Shay added the bug Something isn't working label Sep 17, 2026
@Jacob-Shay Jacob-Shay closed this Sep 17, 2026
@Jacob-Shay

Copy link
Copy Markdown
Contributor Author

Won't let me make changes or merge.

@Jacob-Shay Jacob-Shay reopened this Sep 17, 2026
@Jacob-Shay

Copy link
Copy Markdown
Contributor Author

@MichaelPesce I need help fixing this conflict. I have tried making a PR to update the branch from main I have tried deleting src/ogrre_data_cleaning/processor_schemas/RRC Schema.xlsx in the branch then making another PR to update the branch and I keep getting the same conflict.

@MichaelPesce

Copy link
Copy Markdown
Contributor

@Jacob-Shay I think I can help but I'm not sure what your intention was for the file src/ogrre_data_cleaning/processor_schemas/RRC Schema.xlsx. Do you want it to be deleted?

@Jacob-Shay

Copy link
Copy Markdown
Contributor Author

@MichaelPesce No, the only thing I know is that has been preventing the merge.

@MichaelPesce

Copy link
Copy Markdown
Contributor

@Jacob-Shay I just refreshed Schema-Updates with main. I left that src/ogrre_data_cleaning/processor_schemas/RRC Schema.xlsx file as deleted, because that's what it was in this branch, and I'm not sure what it should look like. If you are going to add it back in, just make sure to pull from this branch before making additional updates

@Jacob-Shay
Jacob-Shay merged commit d35fed5 into main Sep 17, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants