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

[GEOS-11376] Graduate Raster Attribute Table to extension #7581

Merged
merged 1 commit into from
Apr 27, 2024

Conversation

aaime
Copy link
Member

@aaime aaime commented Apr 26, 2024

GEOS-11376 Powered by Pull Request Badge

See https://github.com/geoserver/geoserver/wiki/GSIP-222

Checklist

For core and extension modules:

  • New unit tests have been added covering the changes.
  • Documentation has been updated (if change is visible to end users).
  • The REST API docs have been updated (when changing configuration objects or the REST controllers).
  • There is an issue in the GeoServer Jira (except for changes that do not affect administrators or end users in any way).
  • Commit message(s) must be in the form [GEOS-XYZWV] Title of the Jira ticket.
  • Bug fixes and small new features are presented as a single commit.
  • Each commit has a single objective (if there are multiple commits, each has a separate JIRA ticket describing its goal).

@aaime aaime merged commit 21137d2 into geoserver:main Apr 27, 2024
11 checks passed
@aaime aaime deleted the rat_graduate branch April 27, 2024 06:09
@aaime
Copy link
Member Author

aaime commented Apr 27, 2024

The backport to 2.25.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 734a61908d... [GEOS-11376] Graduate Raster Attribute Table to extension
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 src/community/pom.xml
Auto-merging src/community/release/pom.xml
Auto-merging src/extension/pom.xml
Auto-merging src/extension/rat/pom.xml
CONFLICT (content): Merge conflict in src/extension/rat/pom.xml
Auto-merging src/pom.xml
Auto-merging src/release/pom.xml
Auto-merging src/web/app/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-2.25.x 2.25.x
# Navigate to the new working tree
cd .worktrees/backport-2.25.x
# Create a new branch
git switch --create backport-7581-to-2.25.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 734a61908d9ac0c59c8c43e63001873fc9c62bb1
# Push it to GitHub
git push --set-upstream origin backport-7581-to-2.25.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.25.x

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants