Hi all! Just created the first release PR for our ...
# release-review-trading
l
Hi all! Just created the first release PR for our pipeline nf-core/hadge. Happy to trade a review! github.com/nf-core/hadge/pull/115
Tried to resolve the merge conflicts, but couldn't push the changes due to rule violations.
Copy code
Enumerating objects: 1, done.
Counting objects: 100% (1/1), done.
Writing objects: 100% (1/1), 250 bytes | 250.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
remote: error: GH013: Repository rule violations found for refs/heads/dev.
remote: Review all repository rules at <https://github.com/nf-core/hadge/rules?ref=refs%2Fheads%2Fdev>
remote:
remote: - Changes must be made through a pull request.
remote:
remote: - 2 of 2 required status checks are expected.
remote:
To <https://github.com/nf-core/hadge.git>
 ! [remote rejected] dev -> dev (push declined due to repository rule violations)
error: failed to push some refs to '<https://github.com/nf-core/hadge.git>'
Does anyone have experience resolving merge conflicts in an initial release PR? Do I need to loosen the branch rules?
m
ah, because of the patch fix or what are the merge conflicts?
l
When merging
dev
into
main
for the first release
m
hmm, how come the main branch has template updates 🤔 I can give you temporary override rights, so you can fix this for now.
l
I don't know, it shouldn't have? 😅
m
nope, they should go to the
dev
branch and from there to
main
but it's fine, tell me when you could fix the merge conflicts on your side and I will make the rules stricter again
l
Thank you.
I resolved the merge conflicts. Now, for example, some singularity checks throw an error. To resolve that, I keep pushing changes directly to
dev
without an extra PR into dev? Or how should I do that?
m
Before the first release, yes
gratitude thank you 1
l
Merge conflicts are resolved, and all tests pass now in the CI. Could somebody help me with a review?
@Tommaso Mazza, could you also support us with a review?