Skip to content

Add more fixes to reduce warnings reported by the script for finding substitutions#10936

Merged
DelazJ merged 8 commits intoqgis:masterfrom
DelazJ:substSeparation
Apr 21, 2026
Merged

Add more fixes to reduce warnings reported by the script for finding substitutions#10936
DelazJ merged 8 commits intoqgis:masterfrom
DelazJ:substSeparation

Conversation

@DelazJ
Copy link
Copy Markdown
Collaborator

@DelazJ DelazJ commented Apr 19, 2026

The main objective is to fix those warnings and safely introduce the script in the pre-commit process

Goal:

Ticket(s): #

  • Backport to LTR documentation is requested

@DelazJ DelazJ added the backport release_3.44 On merge create a backported pull request to 3.44 label Apr 19, 2026
@DelazJ DelazJ changed the title Add more fixes to reduce warnings reported by the script for finding subsitutions Add more fixes to reduce warnings reported by the script for finding substitutions Apr 19, 2026
@DelazJ DelazJ merged commit 94afce3 into qgis:master Apr 21, 2026
4 checks passed
@DelazJ DelazJ deleted the substSeparation branch April 21, 2026 09:43
@qgis-bot
Copy link
Copy Markdown
Collaborator

The backport to release_3.44 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply e850d5bddf... Separate text replacement substitutions from the image ones
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 set advice.mergeConflict false"

stdout
Auto-merging substitutions.txt
CONFLICT (content): Merge conflict in substitutions.txt

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.44 release_3.44
# Navigate to the new working tree
cd .worktrees/backport-release_3.44
# Create a new branch
git switch --create backport-10936-to-release_3.44
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e850d5bddf1f89d1845fcb88acf2579a946ca3c9,0c22d02f3e399d9e3744ca3449a3739df2f3b037,19642616bd8c8beb9ff060096fa6e5f564d95eeb,a643e3dea0f69945a795b419c34019bfb360ba72,09c25412da12a57385115b131b340ce5e71ed1c5,3058a9b851699f8209a8125b29af1c1af3f4b493,74dd2917ab322e6a81b54a1c27465a90e2a6d7e4,79d070a6b716bfccb156e65c53372d3c2ed159d4
# Push it to GitHub
git push --set-upstream origin backport-10936-to-release_3.44
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.44

Then, create a pull request where the base branch is release_3.44 and the compare/head branch is backport-10936-to-release_3.44.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport release_3.44 On merge create a backported pull request to 3.44

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants