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

Database: update to EPSG v11.021 #4297

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Database: update to EPSG v11.021 #4297

merged 1 commit into from
Oct 30, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Oct 30, 2024

No description provided.

@rouault rouault added the backport 9.5 Backport to 9.5 branch label Oct 30, 2024
@rouault rouault merged commit de73f24 into OSGeo:master Oct 30, 2024
26 checks passed
@rouault
Copy link
Member Author

rouault commented Oct 30, 2024

The backport to 9.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2e827c7b... Database: update to EPSG v11.021
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 data/CMakeLists.txt
CONFLICT (content): Merge conflict in data/CMakeLists.txt

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

Then, create a pull request where the base branch is 9.5 and the compare/head branch is backport-4297-to-9.5.

@rouault
Copy link
Member Author

rouault commented Oct 30, 2024

9.5 backport in #4299

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 9.5 Backport to 9.5 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant