Skip to content

Conversation

@butu
Copy link
Contributor

@butu butu commented Nov 15, 2024

No description provided.

@garvinhicking garvinhicking merged commit 23d2d9c into TYPO3-Documentation:main Nov 15, 2024
3 checks passed
@garvinhicking
Copy link
Contributor

Thanks a lot for your contribution to fix this! :-)

@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 44a53db... Fix Typo
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
CONFLICT (modify/delete): Documentation/SiteSets/Index.rst deleted in HEAD and modified in 44a53db (Fix Typo).  Version 44a53db (Fix Typo) of Documentation/SiteSets/Index.rst left in tree.

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

@linawolf
Copy link
Member

Content did not yet exist in 12.4

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.

3 participants