test: fix cypress tests by ankush [frappe] PR#26012
From: https://github.com/frappe/frappe/pull/26012
Date: 2024-04-17 20:56:18+05:30
- test: fix cypress tests (#26012)
Diagnostics
Conflicts detected for source commit: 1dcfadf5ca26d4d60fcdaea355275fab79344d1e
↳ Removing file (deleted by them): cypress/integration/folder_navigation.js
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-26012
# Alternatively, re-take the changes
git switch develop
ft take ft-pr-26012
# 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