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

An error message is displayed when an auxiliary layer cannot be created... #43543

Merged
merged 5 commits into from
Jun 7, 2021

Conversation

pblottiere
Copy link
Member

Description

...instead of failing silently.

errmsg

@pblottiere pblottiere added the Requires Tests! Waiting on the submitter to add unit tests before eligible for merging label Jun 3, 2021
@github-actions github-actions bot added this to the 3.20.0 milestone Jun 3, 2021
@pblottiere pblottiere added backport queued_ltr_backports Queued Backports and removed Requires Tests! Waiting on the submitter to add unit tests before eligible for merging labels Jun 7, 2021
@pblottiere pblottiere merged commit 8725daf into qgis:master Jun 7, 2021
@qgis-bot
Copy link
Collaborator

qgis-bot commented Jun 7, 2021

The backport to queued_ltr_backports failed:

The process '/usr/bin/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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-43543-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d290df292f49d3accaf2e16296d83928d92c1c49,eb7d465c42278cb2ebb79812c467e344e8c30868,572995889a5c2e08cf8dacd40dd95a7d66b66add,65a50af5d4cf91877e4425a3956c1e0a999c0366,155fd5c79bb724581b8e724b656c1ba58d393f82
# Push it to GitHub
git push --set-upstream origin backport-43543-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

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

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

Successfully merging this pull request may close these issues.

None yet

3 participants