Error in ERPNext V12.4.0 update - merge conflicts in setup_wizard install fixtures and cypress/integration/form.js

I get this error in update to V12.4.0 from V12.3.1

1 Like

This happened because the git <<<<<<<<<<<<<<<<<<<<<<
the solution is search about <<<<<<<<<<
and open the files one by one and delete the <<<<<<<<<<<<<
then make bench update again

or a git reset HEAD~1 --hard followed by a bench update would also work

Aha OK, thank you