Skip to content

Update custom crs screenshots#10868

Merged
DelazJ merged 5 commits intoqgis:masterfrom
clementlsr:update_custom_crs_screenshots
Apr 10, 2026
Merged

Update custom crs screenshots#10868
DelazJ merged 5 commits intoqgis:masterfrom
clementlsr:update_custom_crs_screenshots

Conversation

@clementlsr
Copy link
Copy Markdown
Contributor

Goal: update custom crs screenshots (with QGIS 3.40 interface)

Ticket(s): #

  • Backport to LTR documentation is requested

@DelazJ DelazJ merged commit 9b63c38 into qgis:master Apr 10, 2026
2 of 3 checks passed
@DelazJ
Copy link
Copy Markdown
Collaborator

DelazJ commented Apr 10, 2026

Hi @clementlsr Thanks for the update and sorry it took that long.

@DelazJ DelazJ added backport release_3.40 On merge create a backported pull request to 3.40 backport release_3.44 On merge create a backported pull request to 3.44 labels Apr 10, 2026
@qgis-bot
Copy link
Copy Markdown
Collaborator

The backport to release_3.44 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit 74a9c9bfc7aee0b2811d9a92776be402b41ef9d7 is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-10868-to-release_3.44 3a50caa434] update screenshot
 Author: clementlsr <35683030+clementlsr@users.noreply.github.com>
 Date: Fri Mar 27 12:13:11 2026 +0100
 1 file changed, 0 insertions(+), 0 deletions(-)
[backport-10868-to-release_3.44 9e7bf72eb8] update image
 Author: clementlsr <35683030+clementlsr@users.noreply.github.com>
 Date: Fri Mar 27 12:18:18 2026 +0100
 1 file changed, 0 insertions(+), 0 deletions(-)
[backport-10868-to-release_3.44 e05224b693] update custom crs screenshots
 Author: Clément Laskar <clementlaskar@ti-nuage.fr>
 Date: Fri Mar 27 13:20:58 2026 +0100
 1 file changed, 0 insertions(+), 0 deletions(-)

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-10868-to-release_3.44
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7041427d316d7fa74c529bfceae94b59f776543b,65b0b9d104124894b2160bea5b8b31014169d524,2a821078b2911c6491a41480546c7677c4d1422d,74a9c9bfc7aee0b2811d9a92776be402b41ef9d7,90a4fb264853b28bb8cd0426cbfab8c406b8cd7c
# Push it to GitHub
git push --set-upstream origin backport-10868-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-10868-to-release_3.44.

@qgis-bot
Copy link
Copy Markdown
Collaborator

The backport to release_3.40 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit 74a9c9bfc7aee0b2811d9a92776be402b41ef9d7 is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-10868-to-release_3.40 4643982bd1] update screenshot
 Author: clementlsr <35683030+clementlsr@users.noreply.github.com>
 Date: Fri Mar 27 12:13:11 2026 +0100
 1 file changed, 0 insertions(+), 0 deletions(-)
[backport-10868-to-release_3.40 6602b63419] update image
 Author: clementlsr <35683030+clementlsr@users.noreply.github.com>
 Date: Fri Mar 27 12:18:18 2026 +0100
 1 file changed, 0 insertions(+), 0 deletions(-)
[backport-10868-to-release_3.40 0bb61bea55] update custom crs screenshots
 Author: Clément Laskar <clementlaskar@ti-nuage.fr>
 Date: Fri Mar 27 13:20:58 2026 +0100
 1 file changed, 0 insertions(+), 0 deletions(-)

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.40 release_3.40
# Navigate to the new working tree
cd .worktrees/backport-release_3.40
# Create a new branch
git switch --create backport-10868-to-release_3.40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7041427d316d7fa74c529bfceae94b59f776543b,65b0b9d104124894b2160bea5b8b31014169d524,2a821078b2911c6491a41480546c7677c4d1422d,74a9c9bfc7aee0b2811d9a92776be402b41ef9d7,90a4fb264853b28bb8cd0426cbfab8c406b8cd7c
# Push it to GitHub
git push --set-upstream origin backport-10868-to-release_3.40
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.40

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

DelazJ pushed a commit to DelazJ/QGIS-Documentation that referenced this pull request Apr 10, 2026
---------

Co-authored-by: Clément Laskar <clementlaskar@ti-nuage.fr>
(cherry picked from commit 9b63c38)
DelazJ pushed a commit to DelazJ/QGIS-Documentation that referenced this pull request Apr 10, 2026
---------

Co-authored-by: Clément Laskar <clementlaskar@ti-nuage.fr>
(cherry picked from commit 9b63c38)
DelazJ pushed a commit that referenced this pull request Apr 10, 2026
---------

Co-authored-by: Clément Laskar <clementlaskar@ti-nuage.fr>
(cherry picked from commit 9b63c38)
DelazJ pushed a commit that referenced this pull request Apr 10, 2026
---------

Co-authored-by: Clément Laskar <clementlaskar@ti-nuage.fr>
(cherry picked from commit 9b63c38)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport release_3.40 On merge create a backported pull request to 3.40 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.

3 participants