Skip to content

[Backport master] Fix eslint folders#12850

Open
geo-ghci-int[bot] wants to merge 3 commits intomasterfrom
ghci/backport/12833-to-master
Open

[Backport master] Fix eslint folders#12850
geo-ghci-int[bot] wants to merge 3 commits intomasterfrom
ghci/backport/12833-to-master

Conversation

@geo-ghci-int
Copy link
Copy Markdown
Contributor

@geo-ghci-int geo-ghci-int Bot commented Apr 22, 2026

Backport of #12833 to master

Error on cherry-picking: fbac40d, 09d2f2a, 908f95a

To continue do:

git fetch && \
  git checkout ghci/backport/12833-to-master && \
  git reset --hard HEAD^ && \
  git cherry-pick fbac40d96a444efaf4b6fc2bffcf01342abe6930 09d2f2a433fc59c6f07798bad12ba5c485e5318c 908f95af44363182030b07176d554a7cf665c329

Resolve the conflict, then:

git add <file> && \
  git cherry-pick --continue

When all the conflicts are resolved, push the branch:

git push origin ghci/backport/12833-to-master --force

@sbrunner sbrunner force-pushed the ghci/backport/12833-to-master branch from e21e1b1 to dd467af Compare April 22, 2026 07:14
@sbrunner sbrunner force-pushed the ghci/backport/12833-to-master branch from dd467af to 23f7b4e Compare April 22, 2026 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant