How can there be a conflict for a PR from dev to m...
# pipeline-maintainersd
Daniel Straub
09/30/2026, 9:04 AMHow can there be a conflict for a PR from dev to master? 😱 github.com/nf-core/ampliseq/pull/1091
How can I fix that cleanly? 😬
Just resolve the conflict in the PR as usual on other PRs?
✅ 1
m
mashehu
09/30/2026, 9:06 AMprobably because of the security patch to the
mastermashehu
09/30/2026, 9:07 AMyes, just resovle the conflict in the PR and everything should be good
m
Maxime Garcia
09/30/2026, 9:07 AMIf you have any issues, don't hesitate to ping us
d
Daniel Straub
09/30/2026, 9:08 AMI think I have write rights on dev, so I'll try that now...
Daniel Straub
09/30/2026, 9:11 AMSorry I just feel here uncertain, thats fine, right:
👍🏻 1
m
mashehu
09/30/2026, 9:12 AMyes, go for it
d
Daniel Straub
09/30/2026, 9:13 AMThanks! Done!