The process '/usr/bin/git' failed with exit code 1
stderr
```
error: could not apply 65866cd3... [TASK] Use glob for includes
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
```
Auto-merging Documentation/ColumnsConfig/Type/Category/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Category/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Check/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Check/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Color/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Color/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Datetime/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Email/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/File/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Flex/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Folder/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Group/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Group/_Properties/_Multiple.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/ImageManipulation/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Inline/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Input/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Link/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Number/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Password/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Radio/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/MultipleSideBySide/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/MultipleSideBySide/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Single/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/SingleBox/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/SingleBox/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Tree/Index.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Tree/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Text/T3Editor/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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1151-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 65866cd371f05ab276a60bb8f6072d51c91068e2,25ad0b687720ceba322b30e5ebcd7a0c6cfc70d3
# Push it to GitHub
git push --set-upstream origin backport-1151-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-1151-to-12.4.
The backport to
12.4failed:stderr
``` error: could not apply 65866cd3... [TASK] Use glob for includes hint: After resolving the conflicts, mark them with hint: "git add/rmstdout
``` Auto-merging Documentation/ColumnsConfig/Type/Category/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Category/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Check/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Check/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Color/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Color/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Datetime/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Email/Index.rst Auto-merging Documentation/ColumnsConfig/Type/File/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Flex/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Flex/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Folder/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Group/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Group/_Properties/_Multiple.rst.txt Auto-merging Documentation/ColumnsConfig/Type/ImageManipulation/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Inline/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Input/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Link/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Number/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Password/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Radio/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/MultipleSideBySide/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/MultipleSideBySide/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/Single/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Single/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/SingleBox/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/SingleBox/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/Tree/Index.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Tree/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Text/T3Editor/Index.rst ```To backport manually, run these commands in your terminal:
Then, create a pull request where the
basebranch is12.4and thecompare/headbranch isbackport-1151-to-12.4.