Update frequently fails even after stashing changes on git

I have a problem updating erpnext; sometimes it says I need to stash or commit changes, other times I have an error like attached. I just followed guidelines here: https://discuss.frappe.io/t/update-error-changes-made/4592/6. And afterwards update failed with:
screen shot 2016-09-21 at 1 27 49 pm
This failure occurs 9 out 10 times when trying to update.

@noetico,

This issue is already solved please check the [Important] Error in Bench Update? - #6 by hereabdulla thread

1 Like