Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't block the map when there is a wrong layer name in URL parameters #3955

Merged
merged 1 commit into from
Nov 3, 2023

Conversation

nboisteault
Copy link
Member

Fix gl224

Funded by 3Liz

@github-actions github-actions bot added this to the 3.7.0 milestone Nov 3, 2023
@nboisteault nboisteault self-assigned this Nov 3, 2023
@rldhont rldhont added the run end2end If the PR must run end2end tests or not label Nov 3, 2023
@nboisteault nboisteault merged commit c86f622 into 3liz:master Nov 3, 2023
13 checks passed
@nboisteault nboisteault deleted the fix-gl224 branch November 3, 2023 15:01
@3liz-bot
Copy link
Contributor

3liz-bot commented Nov 3, 2023

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 08a4a4de2... Don't block the map when there is a wrong layer name in URL parameters
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".

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

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

@nboisteault
Copy link
Member Author

Manual backport : dc1c88e

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug failed backport run end2end If the PR must run end2end tests or not
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants