Skip to content

Conversation

@geoserver-bot
Copy link
Collaborator

Backport #1383
Authored by: @aaime

@aaime aaime merged commit 193f5dd into 1.26.x Mar 18, 2025
10 checks passed
@geoserver-bot
Copy link
Collaborator Author

The backport to 1.26.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
On branch backport-1385-to-1.26.x
You are currently cherry-picking commit 079a3239.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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

Then, create a pull request where the base branch is 1.26.x and the compare/head branch is backport-1385-to-1.26.x.

@aaime aaime deleted the backport-1383-to-1.26.x branch May 13, 2025 07:54
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.

3 participants