The process '/usr/bin/git' failed with exit code 1
stderr
```
error: could not apply 15af6f6a... [TASK] Remove common properties
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/Select/CheckBox/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/MultipleSideBySide/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Properties/ItemGroups.rst
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Properties/ItemGroups.rst
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Properties/Items.rst deleted in 15af6f6a ([TASK] Remove common properties) and modified in HEAD. Version HEAD of Documentation/ColumnsConfig/Type/Select/Properties/Items.rst left in tree.
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Properties/Mm.rst deleted in 15af6f6a ([TASK] Remove common properties) and modified in HEAD. Version HEAD of Documentation/ColumnsConfig/Type/Select/Properties/Mm.rst left in tree.
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/Index.rst
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Single/_Properties/_DbFieldLength.rst.txt deleted in HEAD and modified in 15af6f6a ([TASK] Remove common properties). Version 15af6f6a ([TASK] Remove common properties) of Documentation/ColumnsConfig/Type/Select/Single/_Properties/_DbFieldLength.rst.txt left in tree.
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/_Properties/_Items.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Select/Single/_Properties/_Mm.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Select/SingleBox/Index.rst
Auto-merging Documentation/ColumnsConfig/Type/Select/Tree/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-1147-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 15af6f6a6ab69c31c929a153c069a4b1fded02a7,339c008780e0d4526691317dfa21ad6e8fc87092
# Push it to GitHub
git push --set-upstream origin backport-1147-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-1147-to-12.4.
The backport to
12.4failed:stderr
``` error: could not apply 15af6f6a... [TASK] Remove common properties hint: After resolving the conflicts, mark them with hint: "git add/rmstdout
``` Auto-merging Documentation/ColumnsConfig/Type/Select/CheckBox/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/MultipleSideBySide/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/Properties/ItemGroups.rst CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Select/Properties/ItemGroups.rst CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Properties/Items.rst deleted in 15af6f6a ([TASK] Remove common properties) and modified in HEAD. Version HEAD of Documentation/ColumnsConfig/Type/Select/Properties/Items.rst left in tree. CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Properties/Mm.rst deleted in 15af6f6a ([TASK] Remove common properties) and modified in HEAD. Version HEAD of Documentation/ColumnsConfig/Type/Select/Properties/Mm.rst left in tree. Auto-merging Documentation/ColumnsConfig/Type/Select/Single/Index.rst CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/Single/_Properties/_DbFieldLength.rst.txt deleted in HEAD and modified in 15af6f6a ([TASK] Remove common properties). Version 15af6f6a ([TASK] Remove common properties) of Documentation/ColumnsConfig/Type/Select/Single/_Properties/_DbFieldLength.rst.txt left in tree. Auto-merging Documentation/ColumnsConfig/Type/Select/Single/_Properties/_Items.rst.txt Auto-merging Documentation/ColumnsConfig/Type/Select/Single/_Properties/_Mm.rst.txt Auto-merging Documentation/ColumnsConfig/Type/Select/SingleBox/Index.rst Auto-merging Documentation/ColumnsConfig/Type/Select/Tree/Index.rst ```To backport manually, run these commands in your terminal:
Then, create a pull request where the
basebranch is12.4and thecompare/headbranch isbackport-1147-to-12.4.