chore(deps): bump actions/checkout from 5 to 6 by dependabot[bot] [frappe] PR#34871
From: https://github.com/frappe/frappe/pull/34871
Date: 2025-11-24 20:27:42+01:00
Diagnostics
Conflicts detected for source commit: a8d4fc9cd1f97504395de3c2527f9c08261966a6
- DU .github/workflows/_base-migration.yml
- DU .github/workflows/_base-server-tests.yml
- DU .github/workflows/_base-type-check.yml
- DU .github/workflows/_base-ui-tests.yml
- DU .github/workflows/backport.yml
- DU .github/workflows/create-release.yml
- DU .github/workflows/generate-pot-file.yml
- DU .github/workflows/labeller.yml
- DU .github/workflows/linters.yml
- DU .github/workflows/on_release.yml
- DU .github/workflows/publish-assets-develop.yml
- DU .github/workflows/run-indinvidual-tests.yml
- DU .github/workflows/server-tests.yml
- DU .github/workflows/ui-tests.yml
Cleaning files from denylist:
.github/workflows/_base-migration.yml | 201 +++++++++++++++++++++++++++
.github/workflows/_base-server-tests.yml | 187 +++++++++++++++++++++++++
.github/workflows/_base-type-check.yml | 90 ++++++++++++
.github/workflows/_base-ui-tests.yml | 173 +++++++++++++++++++++++
.github/workflows/backport.yml | 26 ++++
.github/workflows/create-release.yml | 34 +++++
.github/workflows/generate-pot-file.yml | 35 +++++
.github/workflows/labeller.yml | 18 +++
.github/workflows/linters.yml | 111 +++++++++++++++
.github/workflows/on_release.yml | 65 +++++++++
.github/workflows/publish-assets-develop.yml | 45 ++++++
.github/workflows/run-indinvidual-tests.yml | 138 ++++++++++++++++++
.github/workflows/server-tests.yml | 102 ++++++++++++++
.github/workflows/ui-tests.yml | 78 +++++++++++
14 files changed, 1303 insertions(+)Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-34871
# Alternatively, re-take the changes
git switch develop
ft take ft-pr-34871
# Make changes then rebase
git rebase -i develop
# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue
# Force-push changes
git push --force-with-lease