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 crash in merge features dialog when a field has a unique constraint set #54862

Merged
merged 1 commit into from Oct 6, 2023

Conversation

nyalldawson
Copy link
Collaborator

Fixes #54856

@github-actions github-actions bot added this to the 3.34.0 milestone Oct 6, 2023
@nyalldawson nyalldawson merged commit dd1a0eb into qgis:master Oct 6, 2023
34 checks passed
@nyalldawson nyalldawson deleted the fix_54856 branch October 6, 2023 22:14
@qgis-bot
Copy link
Collaborator

qgis-bot commented Oct 6, 2023

The backport to release-3_28 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ec631e820d... Fix crash in merge features dialog when a field has a unique
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/app/qgsmergeattributesdialog.cpp
CONFLICT (content): Merge conflict in src/app/qgsmergeattributesdialog.cpp
Auto-merging tests/src/app/testqgsmergeattributesdialog.cpp
CONFLICT (content): Merge conflict in tests/src/app/testqgsmergeattributesdialog.cpp

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge Selected Features crashes on Temporary Scratch Layers
3 participants