I used all command you suggested and I got this error.
ro...@erpnext-VirtualBox:~# cd /var/www/erpnext/lib
ro...@erpnext-VirtualBox:/var/www/erpnext/lib# git add .
ro...@erpnext-VirtualBox:/var/www/erpnext/lib# git stash
Saved working directory and index state WIP on master: 6d0438c [fix] [minor] webshop fixes after bootstrap 3
HEAD is now at 6d0438c [fix] [minor] webshop fixes after bootstrap 3
ro...@erpnext-VirtualBox:/var/www/erpnext/lib# cd /var/www/erpnext && lib/wnf.py --update origin master
remote: Counting objects: 22, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 13 (delta 10), reused 12 (delta 9)
Unpacking objects: 100% (13/13), done.
* branch master -> FETCH_HEAD
Updating 6d0438c..1b2a364
Fast-forward
core/doctype/custom_script/custom_script.py | 5 +++--
webnotes/utils/email_lib/bulk.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
remote: Counting objects: 36518, done.
remote: Compressing objects: 100% (14251/14251), done.
Receiving objects: 100% (34564/34564), 8.75 MiB | 203 KiB/s, done.
remote: Total 34564 (delta 24161), reused 29865 (delta 19635)
Resolving deltas: 100% (24161/24161), completed with 781 local objects.
* branch master -> FETCH_HEAD
Updating fad6746..80a2f70
error: The following untracked working tree files would be overwritten by merge:
accounts/report/accounts_payable/__init__.py
accounts/report/accounts_payable/accounts_payable.js
accounts/report/accounts_payable/accounts_payable.py
accounts/report/accounts_payable/accounts_payable.txt
accounts/report/accounts_receivable/__init__.py
accounts/report/accounts_receivable/accounts_receivable.js
accounts/report/accounts_receivable/accounts_receivable.py
accounts/report/accounts_receivable/accounts_receivable.txt
accounts/report/bank_clearance_summary/__init__.py
accounts/report/bank_clearance_summary/bank_clearance_summary.js
accounts/report/bank_clearance_summary/bank_clearance_summary.py
accounts/report/bank_clearance_summary/bank_clearance_summary.txt
accounts/report/bank_reconciliation_statement/__init__.py
accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.txt
accounts/report/budget_variance_report/__init__.py
accounts/report/budget_variance_report/budget_variance_report.js
accounts/report/budget_variance_report/budget_variance_report.py
accounts/report/budget_variance_report/budget_variance_report.txt
accounts/report/customer_account_head/__init__.py
accounts/report/customer_account_head/customer_account_head.py
accounts/report/customer_account_head/customer_account_head.txt
accounts/report/item_wise_purchase_register/__init__.py
accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
accounts/report/item_wise_purchase_register/item_wise_purchase_register.txt
accounts/report/item_wise_sales_register/__init__.py
accounts/report/item_wise_sales_register/item_wise_sales_register.js
accounts/report/item_wise_sales_register/item_wise_sales_register.py
accounts/report/item_wise_sales_register/item_wise_sales_register.txt
accounts/report/payment_collection_with_ageing/__init__.py
accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.js
accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.py
accounts/report/payment_collection_with_ageing/payment_collection_with_ageing.txt
accounts/report/payment_made_with_ageing/__init__.py
accounts/report/payment_made_with_ageing/payment_made_with_ageing.js
accounts/report/payment_made_with_ageing/payment_made_with_ageing.py
accounts/report/payment_made_with_ageing/payment_made_with_ageing.txt
accounts/report/purchase_invoice_trends/__init__.py
accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
accounts/report/purchase_invoice_trends/purchase_invoice_trends.py
accounts/report/purchase_invoice_trends/purchase_invoice_trends.txt
accounts/report/purchase_order_items_to_be_billed/__init__.py
accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.txt
accounts/report/purchase_register/__init__.py
accounts/report/purchase_register/purchase_register.js
accounts/report/purchase_register/purchase_register.py
accounts/report/purchase_register/purchase_register.txt
accounts/report/received_items_to_be_billed/__init__.py
accounts/report/received_items_to_be_billed/received_items_to_be_billed.txt
accounts/report/sales_invoice_trends/__init__.py
accounts/report/sales_invoice_trends/sales_invoice_trends.js
accounts/report/sales_invoice_trends/sales_invoice_trends.py
accounts/report/sales_invoice_trends/sales_invoice_trends.txt
accounts/report/sales_partners_commission/__init__.py
accounts/report/sales_partners_commission/sales_partners_commission.txt
accounts/report/sales_register/__init__.py
accounts/report/sales_register/sales_register.js
accounts/report/sales_register/sales_register.py
accounts/report/sales_register/sales_register.txt
accounts/report/supplier_account_head/__init__.py
accounts/report/supplier_account_head/supplier_account_head.py
accounts/report/supplier_account_head/sup
Aborting
Traceback (most recent call last):
File "lib/wnf.py", line 513, in <module>
run()
File "lib/wnf.py", line 437, in run
patch_sync_build()
File "lib/wnf.py", line 81, in patch_sync_build
patch_sync()
File "lib/wnf.py", line 92, in patch_sync
sync_all()
File "lib/wnf.py", line 73, in sync_all
webnotes.model.sync.sync_all(force)
File "/var/www/erpnext/lib/webnotes/model/sync.py", line 15, in sync_all
sync_for("lib", force)
File "/var/www/erpnext/lib/webnotes/model/sync.py", line 21, in sync_for
folder), force, sync_everything)
File "/var/www/erpnext/lib/webnotes/model/sync.py", line 44, in walk_and_sync
if import_file(module_name, doctype, name, force):
File "/var/www/erpnext/lib/webnotes/modules/import_file.py", line 25, in import_file
ret = import_file_by_path(path, force)
File "/var/www/erpnext/lib/webnotes/modules/import_file.py", line 46, in import_file_by_path
import_doclist(doclist)
File "/var/www/erpnext/lib/webnotes/modules/import_file.py", line 96, in import_doclist
new_bean.insert()
File "/var/www/erpnext/lib/webnotes/model/bean.py", line 282, in insert
return self.save()
File "/var/www/erpnext/lib/webnotes/model/bean.py", line 312, in save
self.save_main()
File "/var/www/erpnext/lib/webnotes/model/bean.py", line 237, in save_main
self.doc.save(check_links = False, ignore_fields = self.ignore_fields)
File "/var/www/erpnext/lib/webnotes/model/doc.py", line 403, in save
keep_timestamps=keep_timestamps)
File "/var/www/erpnext/lib/webnotes/model/doc.py", line 357, in _update_values
(self.doctype, ', '.join(update_str), "%s"), values)
File "/var/www/erpnext/lib/webnotes/db.py", line 111, in sql
raise e
_mysql_exceptions.OperationalError: (1054, "Unknown column 'icon' in 'field list'")