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

[OGR provider] Map GeometryCollection of TIN coming from multipart shapefiles to MultiPolygonZ (fixes #29376) #30024

Merged
merged 1 commit into from May 30, 2019

Conversation

rouault
Copy link
Contributor

@rouault rouault commented May 30, 2019

No description provided.

@rouault rouault added backport release-3_4 Bug Either a bug report, or a bug fix. Let's hope for the latter! labels May 30, 2019
@nyalldawson nyalldawson merged commit 50dab59 into qgis:master May 30, 2019
@backporting
Copy link
Contributor

backporting bot commented May 30, 2019

The backport to release-3_4 failed:

Commits ["26dc155da55286aef69496cdd9e92457be3562a0"] could not be cherry-picked on top of release-3_4

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport release-3_4
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 26dc155da55286aef69496cdd9e92457be3562a0
# Create a new branch with these backported commits.
git checkout -b backport-30024-to-release-3_4
# Push it to GitHub.
git push --set-upstream origin backport-30024-to-release-3_4
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is release-3_4 and the compare/head branch is backport-30024-to-release-3_4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants