search

markowetzlab / scDNAseq-workflow

calling absolute copy numbers on single cell DNA sequencing data - stagging repo for public release
3 stars 2 forks source link

Unresolved merge conflicts in the default/main branch #9

Closed TBradley27 closed 9 months ago

TBradley27 commented 9 months ago

Hello,

There seems to be unresolved merging issues in the following files:

workflow/rules/combine.smk workflow/rules/density.smk workflow/rules/qc.smk workflow/rules/scale_scAbsolute.smk

This prevents the workflow from running correctly

leachim commented 9 months ago

@shafighi if you could please commit your changes asap

shafighi commented 9 months ago

It should be fine now.

leachim commented 9 months ago

@TBradley27 please give it a try now and let us know if it's still not working.

TBradley27 commented 9 months ago

Thanks - the merging issues seem to have been resolved.

However, the output path of the rule scale_scAbsolute does not match the input path of the rule combine - as one rule uses the 'scale' subdirectory, whilst the other does not

leachim commented 9 months ago

@shafighi please have a look at this, should be a very quick fix.

shafighi commented 9 months ago

It should be fixed now. @TBradley27 please let us know if it is still not working.