Here’s my clucky work around.
git cherry-pick 723e16c ... git cherry-pick --continue
- Create a new branch off the target branch.
- Cherry pick the commit that seems to be throwing the error incorrectly. Apply it to your new branch.
- Setup a new pull request from this new branch.
- Assuming that new pull request merges successfully, your original pull request should now also progress.
Yes it will create another commit which is sad but it will get things moving.
Does anyone know why this happens? Is it “squash merge” related?