search

Alamar-Biosciences / NULISAseqR

NULISAseq R package
GNU General Public License v3.0
2 stars 1 forks source link

Merge dev to main: Update detectability reporting #84

Closed jkkbuddika closed 1 year ago

jkkbuddika commented 1 year ago

@jcbeer See modifications above. Hopefully, these address your comments. Please LMK if there are other changes needed.

jcbeer commented 1 year ago

looks great. thanks Kasun!

jcbeer commented 1 year ago

I resolved conflicts in the skeleton.Rmd. This is the error I am now getting:

remote: Resolving deltas: 0% (0/6)
remote: Resolving deltas: 16% (1/6)
remote: Resolving deltas: 33% (2/6)
remote: Resolving deltas: 50% (3/6)
remote: Resolving deltas: 66% (4/6)
remote: Resolving deltas: 83% (5/6)
remote: Resolving deltas: 100% (6/6)
remote: Resolving deltas: 100% (6/6), completed with 6 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/dev.
remote: error: Required status check "AWS CodeBuild us-west-1 (nulisaseq_r_code_build)" is expected.
To github.com:Alamar-Biosciences/NULISAseqR.git ! [remote rejected] HEAD -> dev (protected branch hook declined) error: failed to push some refs to 'github.com:Alamar-Biosciences/NULISAseqR.git'

Also sorry but I accidentally resolved the conflict on dev_kb as I mistakenly thought these changes were on that branch, so dev_kb might need to be fixed.