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 Spring version from 5.3.33 to 5.3.34 #1239

Merged
merged 1 commit into from
May 7, 2024
Merged

Conversation

mprins
Copy link
Contributor

@mprins mprins commented Apr 23, 2024

@aaime aaime merged commit b3bdb55 into GeoWebCache:main May 7, 2024
7 checks passed
@aaime
Copy link
Member

aaime commented May 7, 2024

The backport to 1.25.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7357ec00... Upgrade Spring version from 5.3.33 to 5.3.34
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".

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-1239-to-1.25.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7357ec00f4bd3f52997353deb5acc38dc9dac634
# Push it to GitHub
git push --set-upstream origin backport-1239-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-1239-to-1.25.x.

@aaime
Copy link
Member

aaime commented May 7, 2024

The backport to 1.24.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 7357ec00... Upgrade Spring version from 5.3.33 to 5.3.34
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".

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-1239-to-1.24.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7357ec00f4bd3f52997353deb5acc38dc9dac634
# Push it to GitHub
git push --set-upstream origin backport-1239-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-1239-to-1.24.x.

@mprins mprins deleted the patch-1 branch May 31, 2024 07:29
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