General fixes for release-tool

[Nokel81]

Found while making #7237

[jim-docker]

What does it mean when this appears:

Please resolve conflicts in a separate terminal and then press enter here...

The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
On branch more-fixes-release-tool
Your branch is up to date with 'origin/more-fixes-release-tool'.

You are currently cherry-picking commit 2550b1efbd.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   package-lock.json

no changes added to commit (use "git add" and/or "git commit -a")
Please resolve conflicts in a separate terminal and then press enter here...

The cherry-pick succeeded without conflicts? Or the commit was already in the branch? If it is already in the branch then it should probably be removed from the list of commits for the release. Feels like this should proceed to the next cherry-pick without user interaction.

[Nokel81]

The cherry-pick succeeded without conflicts? Or the commit was already in the branch? If it is already in the branch then it should probably be removed from the list of commits for the release. Feels like this should proceed to the next cherry-pick without user interaction.

This is just how git works. I don't want to try and parse git output....

I think that git cherry-pick --continue would be the correct course of action.