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

[processing] Fix translation of elapsed strings #58928

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

nyalldawson
Copy link
Collaborator

Fixes #58635

@github-actions github-actions bot added this to the 3.40.0 milestone Oct 1, 2024
Copy link

github-actions bot commented Oct 1, 2024

🪟 Windows builds ready!

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

(Built from commit d6c7d8e)

@nyalldawson nyalldawson merged commit 0d55518 into qgis:master Oct 1, 2024
35 checks passed
@nyalldawson nyalldawson deleted the fix_58635 branch October 1, 2024 10:30
@qgis-bot
Copy link
Collaborator

qgis-bot commented Oct 1, 2024

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply d6c7d8e6d4b... [processing] Fix translation of elapsed strings
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 python/plugins/processing/gui/AlgorithmDialog.py
CONFLICT (content): Merge conflict in python/plugins/processing/gui/AlgorithmDialog.py

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

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Oct 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
3 participants