Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

[TASK] Split up page TSconfig's mod properties #446

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

brotkrueml
Copy link
Contributor

The mod page is really long. By splitting up, the pages are much smaller. Additionally, the properties are now visible in the main navigation which eases the access.

In the new pages, only the header sections are adjusted, nothing else is done. They can be streamlined in a follow-up.

Releases: main, 12.4, 11.5

The mod page is really long. By splitting up, the pages
are much smaller. Additionally, the properties are now visible in the main
navigation which eases the access.

In the new pages, only the header sections are adjusted, nothing else is done.
They can be streamlined in a follow-up.

Releases: main, 12.4, 11.5
Copy link
Contributor

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

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

Good idea on splitting this up

@brotkrueml brotkrueml merged commit 3fd6f96 into TYPO3-Documentation:main Apr 3, 2024
4 checks passed
@brotkrueml brotkrueml deleted the split-up-mod branch April 3, 2024 15:18
Copy link
Contributor

github-actions bot commented Apr 3, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ec9790d... [TASK] Split up page TSconfig's mod properties
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/PageTsconfig/Mod.rst
CONFLICT (content): Merge conflict in Documentation/PageTsconfig/Mod.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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-446-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ec9790d46d199e8cc30fecbbe3dc106a9f8a2c09
# Push it to GitHub
git push --set-upstream origin backport-446-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-446-to-11.5.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants