TYPO3-Documentation / TYPO3CMS-Reference-TCA

Complete reference to the Table Configuration Array ($GLOBALS['TCA']).
https://docs.typo3.org/m/typo3/reference-tca/master/en-us/
14 stars 137 forks source link

[TASK] Merge properties to selectCheckbox #1142

Closed linawolf closed 3 months ago

linawolf commented 3 months ago

Releases: main, 12.4

github-actions[bot] commented 3 months ago

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply a145c2f4... [TASK] Merge properties to selectCheckbox 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 ``` CONFLICT (modify/delete): Documentation/ColumnsConfig/Type/Select/CheckBox/Properties.rst deleted in a145c2f4 ([TASK] Merge properties to selectCheckbox) and modified in HEAD. Version HEAD of Documentation/ColumnsConfig/Type/Select/CheckBox/Properties.rst left in tree. Auto-merging Documentation/ColumnsConfig/Type/Select/Properties/ItemGroups.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-1142-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a145c2f4f56088dc7f80123d6dca85178f34a7e1
# Push it to GitHub
git push --set-upstream origin backport-1142-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-1142-to-12.4.