Skip to content

ci: fix ocassional patch test failure by ankush [frappe] PR#25001

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

From: https://github.com/frappe/frappe/pull/25001
Date: 2024-02-21 14:29:00+00:00


Diagnostics

Conflicts detected for source commit: 4f18daba1768efab42c55aa67dff4e85f65ea125
- DU .github/workflows/patch-mariadb-tests.yml
Cleaning files from denylist:
 .github/workflows/patch-mariadb-tests.yml | 170 ++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)


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

# 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