[TASK] Merge properties to text - rte page

[linawolf]

Releases: main, 12.4

[github-actions]

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply 9de95229... [TASK] Merge properties to text - rte page
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", 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 (file location): Documentation/ColumnsConfig/Type/Text/Properties/Format.rst added in HEAD inside a directory that was renamed in 9de95229 ([TASK] Merge properties to text - rte page), suggesting it should perhaps be moved to Documentation/ColumnsConfig/Type/Text/Default/_Properties/Format.rst.
Auto-merging Documentation/ColumnsConfig/Type/Text/Default/_Properties/_Eval.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Text/Default/_Properties/_Min.rst.txt
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Text/Default/_Properties/_Min.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Text/Default/_Properties/_Nullable.rst.txt
CONFLICT (content): Merge conflict in Documentation/ColumnsConfig/Type/Text/Default/_Properties/_Nullable.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Text/Default/_Properties/_Rows.rst.txt
Auto-merging Documentation/ColumnsConfig/Type/Text/Index.rst
CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Text/Properties/Index.rst deleted in 9de95229 ([TASK] Merge properties to text - rte page) and modified in HEAD.  Version HEAD of Documentation/ColumnsConfig/Type/Text/Properties/Index.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-1138-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9de952299b6e627b49d185a3dd83485b8b0ddbe3
# Push it to GitHub
git push --set-upstream origin backport-1138-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-1138-to-12.4.