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

[Bugfix] LocatByLayer - Error after automatic ESlint #5531

Merged
merged 2 commits into from
Mar 7, 2025

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Mar 7, 2025

After #5334 the locateByLayer contains an error

@rldhont rldhont added javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not backport release_3_8 backport release_3_9 labels Mar 7, 2025
@rldhont rldhont requested a review from Gustry March 7, 2025 09:13
@github-actions github-actions bot added this to the 3.10.0 milestone Mar 7, 2025
@rldhont rldhont merged commit 90f36a5 into 3liz:master Mar 7, 2025
23 of 28 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Mar 7, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 285b32b61... [Bugfix] LocatByLayer - Error after automatic ESlint
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
CONFLICT (modify/delete): assets/src/modules/LocateByLayer.js deleted in HEAD and modified in 285b32b61 ([Bugfix] LocatByLayer - Error after automatic ESlint).  Version 285b32b61 ([Bugfix] LocatByLayer - Error after automatic ESlint) of assets/src/modules/LocateByLayer.js left in tree.

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-5531-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 285b32b616824924fae5c8d5820cb27f34dc7a12,fdd8f5dd156470f96e16921e302251c8aa34ccd6
# Push it to GitHub
git push --set-upstream origin backport-5531-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-5531-to-release_3_8.

@rldhont
Copy link
Collaborator Author

rldhont commented Mar 7, 2025

No backport needed to release_3_8, LocateByLayer.js does not exit before release_3_9

@rldhont rldhont deleted the fix-locate-by-layer-after-eslint branch March 7, 2025 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_9 failed backport javascript Pull requests that update Javascript code 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