Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TASK] Add links on "text" TCA type page #804

Merged

Conversation

brotkrueml
Copy link
Contributor

Also fixes an anchor to the "property enableRichtext". Additionally, add line breaks after 80 characters.

Releases: main, 12.4, 11.5

Also fixes an anchor to the "property enableRichtext".
Additionally, add line breaks after 80 characters.

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml merged commit 6ea9a39 into TYPO3-Documentation:main Oct 10, 2023
3 checks passed
@brotkrueml brotkrueml deleted the add-links-text-field branch October 10, 2023 15:45
@github-actions
Copy link

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6f68ff3... [TASK] Add links on "text" TCA type 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".

stdout
Auto-merging Documentation/Settings.cfg
CONFLICT (content): Merge conflict in Documentation/Settings.cfg

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-804-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6f68ff3056431978cdda3259d50eb63db0e79679
# Push it to GitHub
git push --set-upstream origin backport-804-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-804-to-11.5.

@github-actions
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6f68ff3... [TASK] Add links on "text" TCA type 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".

stdout
Auto-merging Documentation/Settings.cfg
CONFLICT (content): Merge conflict in Documentation/Settings.cfg

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-804-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6f68ff3056431978cdda3259d50eb63db0e79679
# Push it to GitHub
git push --set-upstream origin backport-804-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-804-to-12.4.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TCA that referenced this pull request Oct 12, 2023
…entation#804)

Also fixes an anchor to the "property enableRichtext".
Additionally, add line breaks after 80 characters.

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Oct 12, 2023
Also fixes an anchor to the "property enableRichtext".
Additionally, add line breaks after 80 characters.

Releases: main, 12.4, 11.5
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TCA that referenced this pull request Oct 12, 2023
…entation#804)

Also fixes an anchor to the "property enableRichtext".
Additionally, add line breaks after 80 characters.

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Oct 12, 2023
Also fixes an anchor to the "property enableRichtext".
Additionally, add line breaks after 80 characters.

Releases: main, 12.4, 11.5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants