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] Move advanced installation chapters from Getting started #4864

Merged
merged 1 commit into from
Oct 18, 2024

Conversation

linawolf
Copy link
Member

We will keep basic installation guides in the getting started guide but have a home here for all advanced knowledge.

Content was not changed. Manual backport to 12.4 needed

Releases: main, 13.4, 12.4

We will keep basic installation guides in the getting started guide but have a home here for all advanced knowledge.

Content was not changed. Manual backport to 12.4 needed

Releases: main, 13.4, 12.4
@linawolf linawolf self-assigned this Oct 18, 2024
@linawolf linawolf added backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 labels Oct 18, 2024
@linawolf linawolf merged commit 73c5df8 into main Oct 18, 2024
13 checks passed
@linawolf linawolf deleted the task/installation branch October 18, 2024 08:25
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2bd2fc7d0... [TASK] Move advanced installation chapters from Getting started
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 advice.mergeConflict false"

stdout
Auto-merging Documentation/guides.xml
CONFLICT (content): Merge conflict in Documentation/guides.xml

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

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

Successfully merging this pull request may close these issues.

1 participant