Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ImageIO-EXT to 1.4.12 #1280

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Conversation

aaime
Copy link
Member

@aaime aaime commented Jun 14, 2024

No description provided.

@aaime aaime merged commit cf2ae16 into GeoWebCache:main Jun 14, 2024
9 checks passed
@aaime
Copy link
Member Author

aaime commented Jun 14, 2024

The backport to 1.24.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply eefb7d68... Upgrade ImageIO-EXT to 1.4.12
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 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.24.x 1.24.x
# Navigate to the new working tree
cd .worktrees/backport-1.24.x
# Create a new branch
git switch --create backport-1280-to-1.24.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick eefb7d68eb5c9d20a194904df99bf4a29d50ed52
# Push it to GitHub
git push --set-upstream origin backport-1280-to-1.24.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.24.x

Then, create a pull request where the base branch is 1.24.x and the compare/head branch is backport-1280-to-1.24.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.

1 participant