Should I squash the commits?

Regroup the edits: maintainer entry first, then new package. Just two commits. And also look up how to name the commits

I've done that, is it good to go? (After gwg313 reviews it of course)

Ah, I mistook the contents of your PR. There should be 3 (the following are not title examples, unless quoted):

• version bump
• "maintainers: add randomdude"
• "sesh: add randomdude as maintainer"

Sorry for confusion

Ah, I mistook the contents of your PR. There should be 3 (the following are not title examples, unless quoted):

• version bump
• "maintainers: add randomdude"
• "sesh: add randomdude as maintainer"

Sorry for confusion

Sure, that's no problem. Shall I delete this PR and send another one with the required commit structure? (I'm not that experienced with Git, if there's an other way please do tell me)

No need to close:

# 2, because you have 2 commits currently
# and mixed reset (default value) to keep your changes intact
git reset HEAD~2

git commit maintainers -m "maintainers: add randomdude"

# here you interactively choose the maintainers line (git will provide the instructions)
git commit -p pkgs -m "sesh: add randomdude to maintainers"

# and commit the rest, which is version bump + new hashes
git commit pkgs -m "sesh: 2.16.0 -> 2.17.1"

# and finally you force-push the branch here
git push --force-with-lease

From a review suggestion from @acid-bong I've combined the work here into my PR #431945

Looks like me cherry-picking this work isn't possible due to difficulties with the commit verification. I'll try find another approach.

@randomdude16671 I'm happy for you to cherry pick my commits onto this PR if that works for you.

I don't think I can do that very quickly, my machine is currently under service and it needs time, I'll inform you for any updates about the condition.

Don't worry about combining our work, the version fix has been merged now

Sorry for the inconvenience, My machine is up and running how, how should I approach resolving the conflicts? (Specifically naming the commits)

There should only be the three commits you have now, it would be best to create commits resolving any conflicts and squash/fixup them into the appropriate existing commit. e.g the conflict in sesh's maintainers list should be fixed, committed and then squashed into your second commit.

Thanks a lot for all of your patience! I've fixed the conflicts now and the PR is ready for review.

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 430134
Commit: 38f0736da7c8ded304a82bbb36bb12783ed2db66

aarch64-darwin