The process '/usr/bin/git' failed with exit code 1
stderr
```
error: could not apply 0466ad4d... [TASK] Add navigation title to Test Runners
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
```
stdout
```
CONFLICT (modify/delete): Documentation/Testing/TestRunners.rst deleted in HEAD and modified in 0466ad4d ([TASK] Add navigation title to Test Runners). Version 0466ad4d ([TASK] Add navigation title to Test Runners) of Documentation/Testing/TestRunners.rst left in tree.
```
To backport manually, run these commands in your terminal:
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-4573-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0466ad4d293ce14ebdf447c5fcb5316c9e95bdae
# Push it to GitHub
git push --set-upstream origin backport-4573-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4
Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-4573-to-12.4.
The backport to
12.4
failed:stderr
``` error: could not apply 0466ad4d... [TASK] Add navigation title to Test Runners hint: After resolving the conflicts, mark them with hint: "git add/rmstdout
``` CONFLICT (modify/delete): Documentation/Testing/TestRunners.rst deleted in HEAD and modified in 0466ad4d ([TASK] Add navigation title to Test Runners). Version 0466ad4d ([TASK] Add navigation title to Test Runners) of Documentation/Testing/TestRunners.rst left in tree. ```To backport manually, run these commands in your terminal:
Then, create a pull request where the
base
branch is12.4
and thecompare
/head
branch isbackport-4573-to-12.4
.