Skip to content

Conversation

linawolf
Copy link
Member

Before applying changes from TYPO3-Documentation/Changelog-To-Doc#136

Releases: main, 12.4

@linawolf linawolf merged commit dca42be into main Aug 25, 2024
8 checks passed
@linawolf linawolf deleted the task/constant-whitespace branch August 25, 2024 10:37
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 719d0dc5... [TASK] Fix Whitespace in Using setting typoscript
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/UsingSetting/AddTypoScriptWithExtensions.rst
CONFLICT (content): Merge conflict in Documentation/UsingSetting/AddTypoScriptWithExtensions.rst
Auto-merging Documentation/UsingSetting/Entering.rst
Auto-merging Documentation/UsingSetting/Index.rst
CONFLICT (content): Merge conflict in Documentation/UsingSetting/Index.rst
CONFLICT (modify/delete): Documentation/UsingSetting/SiteTypoScriptProvider.rst deleted in HEAD and modified in 719d0dc5 ([TASK] Fix Whitespace in Using setting typoscript).  Version 719d0dc5 ([TASK] Fix Whitespace in Using setting typoscript) of Documentation/UsingSetting/SiteTypoScriptProvider.rst left in tree.
Auto-merging Documentation/UsingSetting/TheConstantEditor.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-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-1320-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 719d0dc5b463deaab73d18a8a15d9c442458a77a
# Push it to GitHub
git push --set-upstream origin backport-1320-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-1320-to-12.4.

linawolf added a commit that referenced this pull request Aug 25, 2024
Before applying changes from  TYPO3-Documentation/Changelog-To-Doc#136

Releases: main, 12.4

(cherry picked from commit dca42be)
@linawolf linawolf added backport-done Changes have been backported to other branches already and removed backport failed labels Aug 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant