Closed jpgreth closed 3 months ago
@jpgreth Thanks for the fix :+1:
The backport to 11.5
failed:
The process '/usr/bin/git' failed with exit code 1
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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-400-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 774d01046dc21391a40e96c2482b9b670f6d470c,a4fecec7ade4f47df65bb1ea5475f2216d573c25
# Push it to GitHub
git push --set-upstream origin backport-400-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5
Then, create a pull request where the base
branch is 11.5
and the compare
/head
branch is backport-400-to-11.5
.
The backport to 12.4
failed:
The process '/usr/bin/git' failed with exit code 1
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-400-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 774d01046dc21391a40e96c2482b9b670f6d470c,a4fecec7ade4f47df65bb1ea5475f2216d573c25
# Push it to GitHub
git push --set-upstream origin backport-400-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-400-to-12.4
.
The documented workflow doesn't work for ddev 1.23.3 anymore. When the
--php-version
parameter is given, ddev doesn't ask fortype
anddocroot
.Releases: main, 12.4, 11.5