Skip to content
This repository has been archived by the owner on Mar 7, 2023. It is now read-only.

Fix TEMPLATE branch #4

Open
ewels opened this issue Apr 21, 2020 · 0 comments
Open

Fix TEMPLATE branch #4

ewels opened this issue Apr 21, 2020 · 0 comments

Comments

@ewels
Copy link
Member

ewels commented Apr 21, 2020

Hi there!

It looks this pipeline has a TEMPLATE branch (great!), however it has no shared history which means that the automated template synchronisation does not work.

In order to fix this for future pipeline syncs, you need to do one fully manual merge. The method for this is documented here: https://nf-co.re/developers/sync#merge-template-into-main-branches
The key is basically to supply --allow-unrelated-histories when running the merge.

You'll need to pull the template changes to your fork first, see these docs.

Once you've done this once, there will be shared history, and future automated sync PRs should work.. Let me know if you need any help.

Phil

x-ref nf-core/tools#548 (comment)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant