[go: up one dir, main page]

fix: Retry contact update if it fails due to conflict by ankush [frappe] PR#24654

Bot Dokosrequested to merge
ft-pr-24654 into develop

From: https://github.com/frappe/frappe/pull/24654
Date: 2024-02-01 10:44:00+05:30

  • fix: Retry contact update if it fails due to conflict (#24654)


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

# 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