fix: don't overwrite existing terms in transaction by barredterra [frappe] PR#39519
From: https://github.com/frappe/erpnext/pull/39519
Date: 2024-01-31 01:12:27+01:00
- Merge pull request #39519 from barredterra/dont-override-tc
- fix: don't overwrite existing terms in transaction
Diagnostics
Suspicious merge commit detected: 0c6c650c08127ea35c937e079a5670d7cae8de4a
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-39519
# 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