Skip to content

Conversation

@rouault
Copy link
Contributor

@rouault rouault commented Dec 9, 2024

@jmckenna jmckenna added the backport branch-8-4 To backport a pull request to branch-8-4 label Dec 9, 2024
@jmckenna jmckenna added this to the 8.4.0 Release milestone Dec 12, 2024
@rouault rouault merged commit 6860e77 into MapServer:main Dec 22, 2024
4 checks passed
@github-actions
Copy link
Contributor

The backport to branch-8-4 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
fatal: invalid reference: branch-8-4

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-branch-8-4 branch-8-4
# Navigate to the new working tree
cd .worktrees/backport-branch-8-4
# Create a new branch
git switch --create backport-985-to-branch-8-4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c6ea47c0208747926edb8adaf9f5ff30c38fa21b
# Push it to GitHub
git push --set-upstream origin backport-985-to-branch-8-4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-8-4

Then, create a pull request where the base branch is branch-8-4 and the compare/head branch is backport-985-to-branch-8-4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport branch-8-4 To backport a pull request to branch-8-4 failed backport

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants