Hi everyone! 👋 I'm looking for some advice on renaming a custom pipeline that is currently in development (not yet submitted to nf-core). I followed some previous Slack advice and updated the name in

nf-core.yml

, then ran

nf-core pipelines sync

. This successfully updated the

TEMPLATE

branch. However, when I try to merge these template changes into my active feature branch (which I eventually plan to merge into

dev

), I run into commit errors. What is the best practice for cleanly propagating these template name-change updates from the

TEMPLATE

branch over to a feature branch or

dev

? Any guidance on resolving these commit conflicts would be greatly appreciated! Thank you!

did you run this sync command: https://nf-co.re/docs/developing/template-syncs/manual-sync#sync-a-custom-pipeline-with-a-pull-request

I just ran nf-core pipelines sync after checking out the feature branch that i was working on. Then I ran

git merge TEMPLATE

, and resolved merge conflicts with the feature branch and pushed all changes to the feature branch. I plan to merge this feature branch with the dev branch once all the tests are complete. Would using the method described here would automate all of the steps that i had to do manually or should i roll back the changes and use the sync with the options in the docs?