Skip to content

Conversation

@mguaypaq
Copy link
Member

These are the new changes from the branch sb/add_extra_manual_seg, without the conflicts with the master branch. The original PR is at data-management#182.

bids-validator seems reasonably happy about these changes:

$ bids-validator . --config.ignore=38 --config.ignore=39 --config.ignore=101
bids-validator@1.8.9
bids-specification@disable
(node:25037) Warning: Closing directory handle on garbage collection
(Use `node --trace-warnings ...` to show where the warning was created)
This dataset appears to be BIDS compatible.
        Summary:                  Available Tasks:        Available Modalities: 
        2698 Files, 8.51GB                                MRI                   
        267 - Subjects                                                          
        1 - Session                                                             


        If you have any questions, please post on https://neurostars.org/tags/bids.

@sandrinebedard
Copy link
Member

@mguaypaq I'll let you merge (or is just using the squash and merge fine here?) Thanks!

@mguaypaq mguaypaq merged commit a039cfa into master Nov 22, 2022
@mguaypaq mguaypaq deleted the mgp/fix branch November 22, 2022 18:15
@mguaypaq
Copy link
Member Author

Done! And for future work, you can avoid merge conflicts by starting with:

git checkout master
git pull origin
git checkout -b sb/my_new_topic

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants