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

pj_get_suggested_operation(): tune it to give correct result for RGAF09 to RRAF 1991 / UTM zone 20N + Guadeloupe 1988 height transformation #3952

Merged
merged 1 commit into from
Nov 17, 2023

Conversation

rouault
Copy link
Member

@rouault rouault commented Nov 16, 2023

No description provided.

…09 to RRAF 1991 / UTM zone 20N + Guadeloupe 1988 height transformation
@rouault rouault merged commit b124309 into OSGeo:master Nov 17, 2023
22 checks passed
@rouault
Copy link
Member Author

rouault commented Nov 17, 2023

The backport to 9.3 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1f9b636b... pj_get_suggested_operation(): tune it to give correct result for RGAF09 to RRAF 1991 / UTM zone 20N + Guadeloupe 1988 height transformation
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/iso19111/c_api.cpp
Auto-merging test/cli/testvarious
CONFLICT (content): Merge conflict in test/cli/testvarious
Auto-merging test/cli/tv_out.dist
CONFLICT (content): Merge conflict in test/cli/tv_out.dist

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

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

@rouault
Copy link
Member Author

rouault commented Nov 17, 2023

backport to 9.3 in #3954

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

Successfully merging this pull request may close these issues.

1 participant