Closed nf-core-bot closed 6 months ago
You still have some conflicts I'm afraid
You still have some conflicts I'm afraid
It does not show the conflicts
You still have some conflicts I'm afraid
It does not show the conflicts
You cannot resolve them on github unfortunately, you have to use the command line to solve that.
You still have some conflicts I'm afraid
It does not show the conflicts
You cannot resolve them on github unfortunately, you have to use the command line to solve that.
It is a bit weird, I think it used main for updates, and trying to push changes to dev. So that is is way behind my current developments.. Do you think it is still safe to merge? Can you check the branch nf-core-template-merge-2.14.1?
Congrats!!
Version
2.14.1
of nf-core/tools has just been released with updates to the nf-core template. This automated pull-request attempts to apply the relevant updates to this pipeline.Please make sure to merge this pull-request as soon as possible, resolving any merge conflicts in the
nf-core-template-merge-2.14.1
branch (or your own fork, if you prefer). Once complete, make a new minor release of your pipeline.For instructions on how to merge this PR, please see https://nf-co.re/docs/contributing/sync/.
For more information about this release of nf-core/tools, please see the
v2.14.1
release page.