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

[Backport release-3_38] [attribute form] Fix addition of features from a child feature dialog being added #57888

Merged
merged 1 commit into from
Jun 26, 2024

Conversation

qgis-bot
Copy link
Collaborator

Backport #57875
Authored by: @nirvn

@github-actions github-actions bot added this to the 3.38.1 milestone Jun 26, 2024
@nirvn nirvn added the backport queued_ltr_backports Queued Backports label Jun 26, 2024
Copy link

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 671387c)

@nyalldawson nyalldawson merged commit 7359144 into release-3_38 Jun 26, 2024
34 checks passed
@nyalldawson nyalldawson deleted the backport-57875-to-release-3_38 branch June 26, 2024 19:43
@qgis-bot
Copy link
Collaborator Author

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 671387c400c... [attribute form] Fix addition of features from a child feature dialog being added
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/gui/qgsabstractrelationeditorwidget.cpp
CONFLICT (content): Merge conflict in src/gui/qgsabstractrelationeditorwidget.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-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-57888-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 671387c400c7b968906521cf42866e1d244a6de2
# Push it to GitHub
git push --set-upstream origin backport-57888-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-57888-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jun 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants