#19423 Manual cherry pick instructions fail Issue created by huonw Describe the bug When the auto-cherry picker hits merge conflicts, it gives instructions for a human to manually resolve them, e.g. #19413 (comment):

1. (Ensure your git working directory is clean)

2. Run the following script to reproduce the merge-conflicts:

```

git checkout https://github.com/pantsbuild/pants main \

&& git pull \

&& git fetch https://github.com/pantsbuild/pants 2.16.x \

&& git checkout -b cherry-pick-19413-to-2.16.x FETCH_HEAD \

&& git cherry-pick 0551d86963f6442f8ff05bf9782d08b3c94881f0

```

3. Fix the merge conflicts and commit the changes

4. Run

build-support/cherry_pick/make_pr.sh -- "19413" "2.16.x"

These instructions didn't work for me as written: Step 2:

git checkout

didn't like the URL style:

$ git checkout <https://github.com/pantsbuild/pants> main
error: pathspec '<https://github.com/pantsbuild/pants>' did not match any file(s) known to git
error: pathspec 'main' did not match any file(s) known to git

Step 4: the script isn't executable, and the arg syntax is wrong:

$ build-support/cherry_pick/make_pr.sh -- "19413" "2.16.x"
zsh: permission denied: build-support/cherry_pick/make_pr.sh

$ bash ./build-support/cherry_pick/make_pr.sh -- "19413" "2.16.x"
accepts at most 1 arg(s), received 2

(Minor, the error message for the last one is wrong: it has 3 args.) Pants version 0551d86 OS macOS `git --version`: 2.36.0 Additional info n/a pantsbuild/pants