I think I broke the template-merge pr (again). I t...
# help
n
I think I broke the template-merge pr (again). I tried rebasing it onto dev, but this gives me hours of merge conflicts to resolve, and I think there has to be a better way? github.com/nf-core/genomeassembler/pull/208
🥲 1
I am also too dumb to revert all of those billions of commits in the PR, what is the proper way to do this?
I assume the solution might be: Release dev -> master (which is already on 4.0.3, sort conflicts), ignore the dev PR?