Hello, when I try to do the merging after `nf-core...
# tools
n
Hello, when I try to do the merging after
nf-core pipelines sync
this happens:
Copy code
> git merge TEMPLATE
fatal: refusing to merge unrelated histories
I do not really know why dev and TEMPLATE have unrelated histories (i did not set up that repo). Which magical git commands should I use to make them share history? Is it this https://nf-co.re/docs/tutorials/sync/sync_retrospectively ?
m
I did it a couple of time, it works
n
Hi, I am now trying to follow this, but I am not allowed to force-push into the nf-core repo https://github.com/nf-core/genomeassembler 😕
I am also not sure if I really need to reset template, my fork of the repo does not contain TEMPLATE, could that be the issue?
the nf-core repo contains a TEMPLATE branch, so maybe I just forked wrong..?
m
When you fork, make sure you fork all the branches that should help
You should be able to fix things on your own fork first and then we can see what's the block
n
yeah, that ship has sailed 😉 I have now pulled the TEMPLATE branch into my fork and I am trying to resolve things in there
🙏 1
Ill ping you if (when) I fail