Skip to content

Conversation

@sikeoka
Copy link
Contributor

@sikeoka sikeoka commented Jun 3, 2025

This PR is just a regular dependency upgrade.

@aaime aaime merged commit 0731c5d into GeoWebCache:main Jun 7, 2025
11 checks passed
@geoserver-bot
Copy link
Collaborator

The backport to 1.26.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e04cf4fc... Upgrade postgresql from 42.7.5 to 42.7.6
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.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-1408-to-1.26.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e04cf4fcebcc176b696169a4fd2460a8cd4692b1
# Push it to GitHub
git push --set-upstream origin backport-1408-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-1408-to-1.26.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.

3 participants