Skip to content

chore(deps): bump pre-commit/action from 3.0.0 to 3.0.1 by dependabot[bot] [frappe] PR#24880

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

From: https://github.com/frappe/frappe/pull/24880
Date: 2024-02-12 19:58:34+00:00


Diagnostics

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


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


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

# 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