Skip to content

Conversation

@aaime
Copy link
Member

@aaime aaime commented Mar 17, 2025

No description provided.

@aaime aaime merged commit 03b9154 into GeoWebCache:main Mar 17, 2025
11 checks passed
@geoserver-bot
Copy link
Collaborator

The backport to 1.25.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1dee9a71... Updating jai-ext to 1.1.31
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging geowebcache/pom.xml
CONFLICT (content): Merge conflict in geowebcache/pom.xml

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

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

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