Hi BhupeshGupta,
I have tried your trick, which seems to work for me up to today. But now I am getting this error. Any idea how I can still update erpnext?
Thanks for your help.
xxx@June2015:~/frappe-bench/apps$ cd erpnext/
xxx@June2015:~/frappe-bench/apps/erpnext$ git stash
erpnext/accounts/doctype/fiscal_year/fiscal_year.json: needs merge
erpnext/accounts/doctype/sales_invoice/sales_invoice.json: needs merge
erpnext/selling/doctype/customer/customer.json: needs merge
erpnext/setup/doctype/brand/brand.json: needs merge
erpnext/setup/doctype/company/company.json: needs merge
erpnext/setup/doctype/customer_group/customer_group.json: needs merge
erpnext/setup/doctype/item_group/item_group.json: needs merge
erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json: needs merge
erpnext/setup/doctype/territory/territory.json: needs merge
erpnext/setup/doctype/uom/uom.json: needs merge
erpnext/stock/doctype/delivery_note/delivery_note.json: needs merge
erpnext/stock/doctype/item/item.json: needs merge
erpnext/stock/doctype/stock_entry/stock_entry.json: needs merge
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json: needs merge
erpnext/stock/doctype/warehouse/warehouse.json: needs merge
erpnext/utilities/doctype/contact/contact.json: needs merge
erpnext/accounts/doctype/fiscal_year/fiscal_year.json: needs merge
erpnext/accounts/doctype/sales_invoice/sales_invoice.json: needs merge
erpnext/selling/doctype/customer/customer.json: needs merge
erpnext/setup/doctype/brand/brand.json: needs merge
erpnext/setup/doctype/company/company.json: needs merge
erpnext/setup/doctype/customer_group/customer_group.json: needs merge
erpnext/setup/doctype/item_group/item_group.json: needs merge
erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json: needs merge
erpnext/setup/doctype/territory/territory.json: needs merge
erpnext/setup/doctype/uom/uom.json: needs merge
erpnext/stock/doctype/delivery_note/delivery_note.json: needs merge
erpnext/stock/doctype/item/item.json: needs merge
erpnext/stock/doctype/stock_entry/stock_entry.json: needs merge
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json: needs merge
erpnext/stock/doctype/warehouse/warehouse.json: needs merge
erpnext/utilities/doctype/contact/contact.json: needs merge
erpnext/accounts/doctype/fiscal_year/fiscal_year.json: unmerged (0057d6d5a21350e135a9ffbc1d1a5177ce401107)
erpnext/accounts/doctype/fiscal_year/fiscal_year.json: unmerged (8f887c894f963b9ed99d0ce7040203398145fb9f)
erpnext/accounts/doctype/fiscal_year/fiscal_year.json: unmerged (3d0cdc734cc6ee9bb5934a1f9637792009e9ad5c)
erpnext/accounts/doctype/sales_invoice/sales_invoice.json: unmerged (045678dc545adb3a7e39449106187a4e84c0fbe8)
erpnext/accounts/doctype/sales_invoice/sales_invoice.json: unmerged (25dd3988f14ff836a77cbec9feaa35f4c63135fb)
erpnext/accounts/doctype/sales_invoice/sales_invoice.json: unmerged (b6dbf37c57413c766a5e8ed1f3d1175410474013)
erpnext/selling/doctype/customer/customer.json: unmerged (f2811759241871687c81fc509029269d3adb9c47)
erpnext/selling/doctype/customer/customer.json: unmerged (cced319cf5de4f861252d604ee8dfb6e8dc8d240)
erpnext/selling/doctype/customer/customer.json: unmerged (6a48a8a9b7f8b222fe3f8c6df7ca1a219be2bceb)
erpnext/setup/doctype/brand/brand.json: unmerged (2b20b1011bce0befd0edc923e7743971f460c0e5)
...
fatal: git-write-tree: error building trees
Cannot save the current index state
xxx@June2015:~/frappe-bench/apps/erpnext$