https://nf-co.re logo
Join Slack
Powered by
Any idea why <https://github.com/nf-core/rnavar/pu...
# tools
m
Any idea why https://github.com/nf-core/rnavar/pull/242 is trying to merge 
9881ce3
while it was already merged in https://github.com/nf-core/rnavar/pull/215?
j
maybe it will go away once you resolve the conflicts?
m
I'll have a go
thinking about a pain point for the template update
we should update multiqc separately
j
we keep the example modules up to date in the template, that's why it is updated 😞
m
yeah, I know, and I think it's the nf-core way
but since the files change quite often, and it's a pain to update all the snapshot while working on the template sync, I was wondering about how to deal with this
j
one option would be to add multiqc and fastqc to the "skip_fetures" section in the nf-core.yml
m
that won't change the problem about multiqc being updated by the template sync
j
you shouldn't get any multiqc update if you skip it from the template, no?
m
confused dog
But I want it in my pipeline
j
you already have it, so you can continue to have it, but all updates will have to be manual
m
oooh
I see
sorry I misunderstood the point
j
well now that you make me think about it, I am unsure if the template update will try to remove the module 😅
we should try it out
m
😆
That would be bad indeed
I am noticing some linting issue due to pre-commit coming from the modules repo
Copy code
modules/nf-core/mosdepth/environment.yml
modules/nf-core/umitools/extract/environment.yml
didn't we try to keep the linting up to date with pipelines and modules?
And I am seeing some subworkflows that needs to be update when I have not change the code sadpanda
j
it should be on sync yes, maybe these modules weren't updated since we changed prettier rules?
m
should we run prettier on all files on modules?
ok, so fixed the merged conflicts, and the commit that was already merged from TEMPLATE is still trying to be merged
🤔 1
j
looking at your PR, the commit is there but the changes don't show in the changed files, no?
what happens if you change the base branch from 
dev
to 
main
(or any other) and back to 
dev
?
👀 1
m
Oooh
So that commit vanishes when I switch to 
master
, but is back when I switch back to 
dev
That's a fun one
Anyhow, solved all the conflicts, can I merge safely, even with the coming patch?
j
I think so, yes. the patch will be very small
m
done
🙌🏻 1
Thanks
3 Views
Open in Slack
PreviousNext
Powered by