[frappe] PR #21643
See https://github.com/frappe/frappe/pull/21643
- Merge pull request #21643 from shariquerik/fetch_from_fix
- fix: better fetch_if_empty (old fix #19586)
Tips
# Checkout locally
git fetch upstream
git switch ft-pr-21643
# Make changes then rebase
git rebase -i upstream/develop
# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue
# Force-push changes
git push --force-with-lease