Fix PR 5069

[nboisteault]

No description provided.

[3liz-bot]

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply b61a55b7a... Fix PR 5069
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 assets/src/components/Print.js
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js

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

Then, create a pull request where the base branch is release_3_7 and the compare/head branch is backport-5130-to-release_3_7.

[3liz-bot]

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply b61a55b7a... Fix PR 5069
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 assets/src/components/Print.js
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js

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

Then, create a pull request where the base branch is release_3_8 and the compare/head branch is backport-5130-to-release_3_8.

[3liz-bot]

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply b61a55b7a... Fix PR 5069
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 assets/src/components/Print.js
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js

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

Then, create a pull request where the base branch is release_3_9 and the compare/head branch is backport-5130-to-release_3_9.

[nboisteault]

Backports manually made

[josemvm]

@nboisteault thanks!

[Gustry]

Fixing previous PR #5069 about "Fixing bug about the print overlay stacking"