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

createOperations(): fix incorrect height transformation between 3D promoted RGF93 and CH1903+ (fixes #2541) #2555

Merged
merged 1 commit into from
Mar 5, 2021

Conversation

rouault
Copy link
Member

@rouault rouault commented Mar 5, 2021

No description provided.

@rouault rouault merged commit 667b7c1 into OSGeo:master Mar 5, 2021
@PROJ-BOT
Copy link
Contributor

PROJ-BOT commented Mar 5, 2021

The backport to 8.0 failed:

The process 'git' failed with exit code 1

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

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

@rouault
Copy link
Member Author

rouault commented Mar 5, 2021

Manually backported to 8.0 (and removing the "backport 8.0" label as it is obviously broken)

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.

2 participants