Skip to content

chore(deps): bump actions/checkout from 3 to 4 by dependabot[bot] [frappe] PR#24952

Bot Dokos requested to merge ft-pr-24952 into develop

From: https://github.com/frappe/frappe/pull/24952
Date: 2024-02-19 20:31:46+00:00


Diagnostics

Conflicts detected for source commit: c5d5fad4cc24c8727226a4f3cfc86f4db80578a3
- DU .github/workflows/labeller.yml
Cleaning files from denylist:
 .github/workflows/labeller.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)


Conflicts detected for source commit: 08962ac22a76080ce30674377eac2590882614b8
- DU .github/workflows/labeller.yml
Cleaning files from denylist:
 .github/workflows/labeller.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-24952

# Make changes then rebase
git rebase -i upstream/develop --reapply-cherry-picks

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports