Skip to content

Streamline preview section in TCEMAIN#1693

Merged
linawolf merged 2 commits intoTYPO3-Documentation:13.4from
brotkrueml:patch-1
Feb 28, 2026
Merged

Streamline preview section in TCEMAIN#1693
linawolf merged 2 commits intoTYPO3-Documentation:13.4from
brotkrueml:patch-1

Conversation

@brotkrueml
Copy link
Copy Markdown
Contributor

Mainly:

  • save+view button is not around anymore since quite some versions
  • doktype 255 (recycler) has been dropped with TYPO3 v13

Releases: main, 13.4

Copy link
Copy Markdown
Contributor

@sarahmccarthy123 sarahmccarthy123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good :-)

@linawolf linawolf merged commit 8576f8c into TYPO3-Documentation:13.4 Feb 28, 2026
5 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a0af56b8... Streamline preview section in TCEMAIN
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 set advice.mergeConflict false"

stdout
Auto-merging Documentation/PageTsconfig/TceMain.rst
CONFLICT (content): Merge conflict in Documentation/PageTsconfig/TceMain.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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-1693-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a0af56b8b6403d108011b8d7636cd218929397ca,c302d2a13dcee6b53fa2315f23181376f9f3bdc7
# Push it to GitHub
git push --set-upstream origin backport-1693-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-1693-to-13.4.

linawolf pushed a commit that referenced this pull request Feb 28, 2026
* Streamline preview section in TCEMAIN

* [TASK] Language checks

Releases: main

---------

Co-authored-by: Sarah McCarthy <sarahmccarthy123@yahoo.com>
@linawolf
Copy link
Copy Markdown
Member

Please base future PRs that should go into main on branch main so we can use the automatic backport workflows. Cherrypicked this one for you

@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed backport 13.4 labels Feb 28, 2026
linawolf added a commit that referenced this pull request Feb 28, 2026
* Streamline preview section in TCEMAIN

* [TASK] Language checks

Releases: main

---------

Co-authored-by: Chris Müller <2566282+brotkrueml@users.noreply.github.com>
Co-authored-by: Sarah McCarthy <sarahmccarthy123@yahoo.com>
@brotkrueml brotkrueml deleted the patch-1 branch February 28, 2026 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-done Changes have been backported to other branches already

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants