Skip to content

Conversation

@rldhont
Copy link
Collaborator

@rldhont rldhont commented Jun 10, 2025

By working on using Proj4rs instead of Proj4js #5799, we found a simple way to set axis orientation of some projection.

By working on using Proj4rs instead of Proj4js, we found a simple way to set axis orientation of some projection.
@github-actions github-actions bot added this to the 3.10.0 milestone Jun 10, 2025
@rldhont rldhont merged commit 21417c6 into 3liz:master Jun 10, 2025
22 of 24 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 378effc5a... Fix setting projection axis orientation with a simple way
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 assets/src/modules/Lizmap.js
CONFLICT (content): Merge conflict in assets/src/modules/Lizmap.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-5812-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 378effc5a3a4533a3a140d7bc16969070b11b3a1
# Push it to GitHub
git push --set-upstream origin backport-5812-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-5812-to-release_3_8.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants