3liz / lizmap-web-client

Transfer a QGIS project on a server, Lizmap is providing the web interface to browse it
https://www.lizmap.com
Mozilla Public License 2.0
248 stars 141 forks source link

Popup: remove remaining OL2 dependencies #4535

Closed nboisteault closed 1 week ago

nboisteault commented 1 week ago

Funded by 3Liz

3liz-bot commented 1 week ago

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr ``` error: could not apply 12184024c... Popup: remove remaining OL2 dependencies hint: After resolving the conflicts, mark them with hint: "git add/rm ", 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/legacy/map.js CONFLICT (content): Merge conflict in assets/src/legacy/map.js Auto-merging assets/src/modules/Popup.js CONFLICT (content): Merge conflict in assets/src/modules/Popup.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-4535-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 12184024c832672e56dd5d387c3949b956671903
# Push it to GitHub
git push --set-upstream origin backport-4535-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-4535-to-release_3_7.

nboisteault commented 1 week ago

Backport to 3.7 not needed.