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

Fix: base layer (i) information - stop working #4854

Merged
merged 1 commit into from
Oct 8, 2024

Conversation

nboisteault
Copy link
Member

Fix #4506

Funded by 3Liz

@github-actions github-actions bot added this to the 3.9.0 milestone Oct 8, 2024
@nboisteault nboisteault added run end2end If the PR must run end2end tests or not backport release_3_7 backport release_3_8 labels Oct 8, 2024
@nboisteault nboisteault merged commit b90ec2f into 3liz:master Oct 8, 2024
16 checks passed
@nboisteault nboisteault deleted the fix-baselayers-metadata branch October 8, 2024 12:47
@3liz-bot
Copy link
Contributor

3liz-bot commented Oct 8, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 71ccf1996... Fix: base layer (i) information - stop working
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/legacy/switcher-layers-actions.js
CONFLICT (content): Merge conflict in assets/src/legacy/switcher-layers-actions.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-4854-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 71ccf1996212c0b42639c3a6cc7dea4233890382
# Push it to GitHub
git push --set-upstream origin backport-4854-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-4854-to-release_3_7.

@nboisteault
Copy link
Member Author

No issue in 3.7

rldhont pushed a commit to rldhont/lizmap-web-client that referenced this pull request Oct 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_8 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.

[Bug]: 3.8.0-rc.1 base layer (i) information - stop working
2 participants