Skip to content

chore: bump dropbox by barredterra [frappe] PR#24322

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

From: https://github.com/frappe/frappe/pull/24322
Date: 2024-01-13 14:23:56+00:00


Diagnostics

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


Conflicts detected for source commit: 97b62434fb1dfce5fb0f2e169d452b0abd6c661b
- DU .github/workflows/linters.yml
Cleaning files from denylist:
 .github/workflows/linters.yml | 98 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)


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

# 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