The process '/usr/bin/git' failed with exit code 1
stderr
```
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'
```
stdout
```
On branch backport-219-to-13.4
You are currently cherry-picking commit 2b7bbb8.
(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)
nothing to commit, working tree clean
```
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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-219-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2b7bbb80346e357a0d33f2b6c0f8bd4b58be5bfd,4a2ab198a7b2b62dfa108ba15a82574fb179fdf2
# Push it to GitHub
git push --set-upstream origin backport-219-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4
Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-219-to-13.4.
The backport to
13.4failed:stderr
``` 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' ```stdout
``` On branch backport-219-to-13.4 You are currently cherry-picking commit 2b7bbb8. (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) nothing to commit, working tree clean ```To backport manually, run these commands in your terminal:
Then, create a pull request where the
basebranch is13.4and thecompare/headbranch isbackport-219-to-13.4.