The process '/usr/bin/git' failed with exit code 1
stderr
```
error: could not apply 991c103... Fix minor spelling errors
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".
```
stdout
```
Auto-merging Documentation/Major/Index.rst
CONFLICT (content): Merge conflict in Documentation/Major/Index.rst
Auto-merging Documentation/Major/PreupgradeTasks/Index.rst
```
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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-377-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 991c10396e9629a85b30a8d8f75d60792589ba8a,fd2c50014c86a631e1da71db9655e7c4e92f99d6
# Push it to GitHub
git push --set-upstream origin backport-377-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5
Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-377-to-11.5.
The backport to
11.5failed:stderr
``` error: could not apply 991c103... Fix minor spelling errors hint: After resolving the conflicts, mark them with hint: "git add/rmstdout
``` Auto-merging Documentation/Major/Index.rst CONFLICT (content): Merge conflict in Documentation/Major/Index.rst Auto-merging Documentation/Major/PreupgradeTasks/Index.rst ```To backport manually, run these commands in your terminal:
Then, create a pull request where the
basebranch is11.5and thecompare/headbranch isbackport-377-to-11.5.