Skip to content

Conversation

@rouault
Copy link
Contributor

@rouault rouault commented Dec 22, 2024

No description provided.

@rouault rouault added the backport branch-8-4 To backport a pull request to branch-8-4 label Dec 22, 2024
@jmckenna
Copy link
Member

jmckenna commented Jan 6, 2025

thanks @rouault !

@jmckenna jmckenna merged commit e5905d5 into MapServer:main Jan 6, 2025
3 checks passed
@github-actions
Copy link
Contributor

github-actions bot commented Jan 6, 2025

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-989-to-branch-8-4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b8b836fb541b78058ac4fb25a026fefc9ef22e59
# Push it to GitHub
git push --set-upstream origin backport-989-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-989-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.

3 participants