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

[TASK] Cleanup manuals #380

Merged
merged 1 commit into from
Oct 10, 2023

Conversation

brotkrueml
Copy link
Contributor

Remove outdated manuals and add missing system extension manuals.

Releases: main, 12.4

Remove outdated manuals and add missing system extension manuals.

Releases: main, 12.4
@brotkrueml brotkrueml requested a review from linawolf October 8, 2023 10:18
@brotkrueml brotkrueml self-assigned this Oct 8, 2023
@brotkrueml brotkrueml merged commit b4db532 into TYPO3-Documentation:main Oct 10, 2023
@brotkrueml brotkrueml deleted the cleanup-manuals branch October 10, 2023 15:40
@github-actions
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 387ac01... [TASK] Cleanup manuals
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-380-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 387ac01d26156d8d76578e9b843f34b4eda91055
# Push it to GitHub
git push --set-upstream origin backport-380-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-380-to-12.4.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TSconfig that referenced this pull request Oct 12, 2023
Remove outdated manuals and add missing system extension manuals.

Releases: main, 12.4
brotkrueml added a commit that referenced this pull request Oct 12, 2023
Remove outdated manuals and add missing system extension manuals.

Releases: main, 12.4
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