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

Update statistics of translation #9666

Merged
merged 1 commit into from
Feb 26, 2025

Conversation

geo-ninja
Copy link
Collaborator

Automated changes by create-pull-request GitHub action

@geo-ninja geo-ninja added backport release_3.34 On merge create a backported pull request to 3.34 Translation labels Feb 25, 2025
@DelazJ DelazJ merged commit 0760068 into qgis:master Feb 26, 2025
5 checks passed
@DelazJ DelazJ added the backport release_3.40 On merge create a backported pull request to 3.40 label Feb 26, 2025
@DelazJ DelazJ added backport release_3.34 On merge create a backported pull request to 3.34 and removed backport release_3.34 On merge create a backported pull request to 3.34 labels Feb 26, 2025
@qgis-bot
Copy link
Collaborator

The backport to release_3.34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
To https://github.com/qgis/QGIS-Documentation.git
 ! [rejected]              backport-9666-to-release_3.34 -> backport-9666-to-release_3.34 (fetch first)
error: failed to push some refs to 'https://github.com/qgis/QGIS-Documentation.git'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

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-9666-to-release_3.34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5a59aa24f178803e4abd5307ded87f395dc9c6f4
# Push it to GitHub
git push --set-upstream origin backport-9666-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-9666-to-release_3.34.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3.34 On merge create a backported pull request to 3.34 backport release_3.40 On merge create a backported pull request to 3.40 failed backport Translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants