The process '/usr/bin/git' failed with exit code 1
stderr
```
error: could not apply 303ba3b... [TASK] Introduce directory trees
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", 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
```
[backport-385-to-12.4 f1ae387] [TASK] Replace outdated containers with cards
Author: lina.wolf
Date: Sun Jun 9 15:45:28 2024 +0200
6 files changed, 117 insertions(+), 250 deletions(-)
Auto-merging Documentation/Installation/DeployTYPO3.rst
CONFLICT (content): Merge conflict in Documentation/Installation/DeployTYPO3.rst
Auto-merging Documentation/Installation/Install.rst
Auto-merging Documentation/Installation/LegacyInstallation.rst
CONFLICT (content): Merge conflict in Documentation/Installation/LegacyInstallation.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-385-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 8c5b36f112d38b90dc1c11c01d29ee55aa3b0873,303ba3b24cbbdce3aa131a107569d40267eb126c
# Push it to GitHub
git push --set-upstream origin backport-385-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-385-to-12.4.
The backport to
12.4
failed:stderr
``` error: could not apply 303ba3b... [TASK] Introduce directory trees hint: After resolving the conflicts, mark them with hint: "git add/rmstdout
``` [backport-385-to-12.4 f1ae387] [TASK] Replace outdated containers with cards Author: lina.wolfTo backport manually, run these commands in your terminal:
Then, create a pull request where the
base
branch is12.4
and thecompare
/head
branch isbackport-385-to-12.4
.