From <@U07NHHSE5AT>, TEMPLATE sync is a bit aggres...
# tools
m
From @oliviercoen, TEMPLATE sync is a bit aggressive
👍 1
a
The
TEMPLATE
branch has all the history of the
dev
branch for some reason? I think that it might be best to nuke the branch and retry
o
You meaning completely deleting the TEMPLATE branch? Sorry I'm a bit lost on this part
m
that's what is explained in @Júlia Mir link: https://nf-co.re/docs/tutorials/sync/fixing_broken_template_branch
👍 2
this 1
o
Thanks!
p
Probably don't have to kill the branch and start again, but yeah the template branch needs to stay "clean"
This is why the automated sync creates a new branch from
TEMPLATE
before opening a PR. What can often happen is that you fix merge conflicts, which ends up pushing the dev history back onto
TEMPLATE
Then the next time you try to sync, this happens ☝🏻
👍 1
ok just looked and you don't have any history in
TEMPLATE
from syncs except the initial pipeline build, so should be fine to completely delete it and recreate
When your pipeline is older, you'll have a commit in there for every new release of the template. See for example #rnaseq: https://github.com/nf-core/rnaseq/commits/TEMPLATE/
👍 1
o
Thanks for the explanation! Ok so the reason must be merge conflicts at some point...
👍🏻 1