Skip to content

Conversation

@linawolf
Copy link
Member

Releases: main, 13.4, 12.4

@linawolf linawolf merged commit 56a04d0 into main Oct 25, 2024
@linawolf linawolf deleted the task/deployment2 branch October 25, 2024 09:03
@github-actions
Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d6b439f... [TASK] Update deployement Infos for Beginners
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/Installation/DeployTYPO3.rst
CONFLICT (content): Merge conflict in Documentation/Installation/DeployTYPO3.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-516-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d6b439f32cb3c452f3280da4d7cc6bc2342eaa03
# Push it to GitHub
git push --set-upstream origin backport-516-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-516-to-12.4.

linawolf added a commit that referenced this pull request Nov 6, 2024
Releases: main, 13.4, 12.4

(cherry picked from commit 56a04d0)
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