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

fix #21931 Mesh calculator crash when used with face dataset #9875

Merged
merged 1 commit into from
Apr 29, 2019

Conversation

PeterPetrik
Copy link
Contributor

@PeterPetrik PeterPetrik merged commit 4aaa523 into qgis:master Apr 29, 2019
@backporting
Copy link
Contributor

backporting bot commented Apr 29, 2019

The backport to release-3_4 failed:

Commits ["7c8075825a8b53a5c2727f228420674312c47e24"] 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 7c8075825a8b53a5c2727f228420674312c47e24
# Create a new branch with these backported commits.
git checkout -b backport-9875-to-release-3_4
# Push it to GitHub.
git push --set-upstream origin backport-9875-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-9875-to-release-3_4.

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.

None yet

1 participant