Closed mguaypaq closed 1 year ago
@mguaypaq I'll let you merge (or is just using the squash and merge fine here?) Thanks!
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
These are the new changes from the branch
sb/add_extra_manual_seg
, without the conflicts with themaster
branch. The original PR is at data-management#182.bids-validator
seems reasonably happy about these changes: