Skip to content

fix: workstation refresh after prompt by Nihantra-Patel [frappe] PR#40852

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

From: https://github.com/frappe/erpnext/pull/40852
Date: 2024-04-04 10:58:36+05:30

  • fix: workstation refresh after prompt


Diagnostics

pre-commit failed for source commit: bed1af26e31910067a357b0a62fee9aa563a6abf
eslint...................................................................Failed
- hook id: eslint
- exit code: 1

erpnext/manufacturing/doctype/workstation/workstation.js
  185:3  error  Parsing error: Unexpected token ]

✖ 1 problem (1 error, 0 warnings)


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

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-40852

# 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

Merge request reports