search

Sage-Bionetworks / sysbioDCCjsonschemas

SysBio DCC JSON schemas
1 stars 7 forks source link

Refactored schemas #87

Closed cw-dvr8 closed 3 years ago

cw-dvr8 commented 3 years ago

Move refactored schemas into production.

Aryllen commented 3 years ago

Oh, I see there's a conflicting file. Interestingly, GH will usually allow a person to resolve it in the web, but it won't on this one. Let me know if you would like some assistance fixing that.

cw-dvr8 commented 3 years ago

@Aryllen I'd appreciate some help. That directory doesn't exist anymore so I don't know how I'm supposed to resolve it.

Aryllen commented 3 years ago

This threw me for a loop for a moment! git was confused because the PEC_specific.json file had been altered on master/main, but was deleted in refactored-schemas. I had to add the master's version of the file back to refactored-schemas, commit, then delete and commit, again. It's all fixed now, though!