Template-merge group: Does anyone have conflicts t...
# meta-omics
j
Template-merge group: Does anyone have conflicts to be resolved, but locally they don't show up?
✅ 1
https://github.com/nf-core/funcscan/pull/480 They have to be resolved locally though
j
Nope, not seen that
I can try here
I got them?
image.png
Are you on the right branch for merging/
j
Yup got them, too. Right branch, I just thought
git status
would show them already
j
And did you fetch everything?
👍 1
No not necesarily