Skip to content

Conversation

@jmckenna
Copy link
Member

@mamaar
Copy link

mamaar commented Mar 5, 2025

This looks good to me 👍

@jmckenna jmckenna merged commit bb5f5f7 into MapServer:main Mar 7, 2025
6 checks passed
@github-actions
Copy link

github-actions bot commented Mar 7, 2025

The backport to branch-1-14 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
To https://github.com/MapServer/mapcache.git
 ! [remote rejected] backport-348-to-branch-1-14 -> backport-348-to-branch-1-14 (refusing to allow a GitHub App to create or update workflow `.github/workflows/build-linux.yml` without `workflows` permission)
error: failed to push some refs to 'https://github.com/MapServer/mapcache.git'

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-1-14 branch-1-14
# Navigate to the new working tree
cd .worktrees/backport-branch-1-14
# Create a new branch
git switch --create backport-348-to-branch-1-14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0a566e4e53672429e5097bc4647592b5b1de1b8b,e47e36dd1385523f18366776a8bdf234443ce8d6,187a0e8e6a92ea3e6c40fe09f3cc5175b160a95d,dd1c1f34bce631846abb38758fd67383f1d1cfb1,f042c657a5fceb1375940016dfdf7ad9fc9d43e8
# Push it to GitHub
git push --set-upstream origin backport-348-to-branch-1-14
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-1-14

Then, create a pull request where the base branch is branch-1-14 and the compare/head branch is backport-348-to-branch-1-14.

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.

2 participants