error raise after execuring bench update:
root@ubuntu:/home/frappe/frappe-bench# bench update
INFO:bench.utils:updating bench
Already up-to-date.
remote: Counting objects: 106262, done.
remote: Compressing objects: 100% (27221/27221), done.
remote: Total 106262 (delta 80022), reused 104682 (delta 78480), pack-reused 0
Receiving objects: 100% (106262/106262), 69.41 MiB | 27.30 MiB/s, done.
Resolving deltas: 100% (80022/80022), completed with 963 local objects.
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript
7a007a2…3b8a8c4 master → upstream/master
- [new tag] v7.2.17 → v7.2.17
- [new tag] 4.0.0 → 4.0.0
- [new tag] 4.0.0-beta1 → 4.0.0-beta1
- [new tag] v3.1.0 → v3.1.0
- [new tag] v3.1.1 → v3.1.1
- [new tag] v3.2.0 → v3.2.0
- [new tag] v3.3.0 → v3.3.0
- [new tag] v3.3.1 → v3.3.1
- [new tag] v3.3.2 → v3.3.2
- [new tag] v3.4.0 → v3.4.0
- [new tag] v3.4.1 → v3.4.1
- [new tag] v3.4.2 → v3.4.2
- [new tag] v3.4.3 → v3.4.3
- [new tag] v3.4.4 → v3.4.4
- [new tag] v3.5.0 → v3.5.0
- [new tag] v3.7.0 → v3.7.0
- [new tag] v3.7.1 → v3.7.1
- [new tag] v3.7.2 → v3.7.2
- [new tag] v3.7.3 → v3.7.3
- [new tag] v3.7.4 → v3.7.4
- [new tag] v3.7.5 → v3.7.5
- [new tag] v3.8.0 → v3.8.0
- [new tag] v3.9.0 → v3.9.0
- [new tag] v3.9.1 → v3.9.1
- [new tag] v3.9.2 → v3.9.2
- [new tag] v3.9.3 → v3.9.3
- [new tag] v3.9.4 → v3.9.4
- [new tag] v3.9.5 → v3.9.5
- [new tag] v4-beta2 → v4-beta2
- [new tag] v4.0.1 → v4.0.1
- [new tag] v4.10.0 → v4.10.0
- [new tag] v4.10.1 → v4.10.1
- [new tag] v4.10.2 → v4.10.2
- [new tag] v4.11.0 → v4.11.0
- [new tag] v4.11.1 → v4.11.1
- [new tag] v4.11.2 → v4.11.2
- [new tag] v4.11.3 → v4.11.3
- [new tag] v4.11.4 → v4.11.4
- [new tag] v4.12.0 → v4.12.0
- [new tag] v4.12.1 → v4.12.1
- [new tag] v4.12.2 → v4.12.2
- [new tag] v4.13.0 → v4.13.0
- [new tag] v4.13.1 → v4.13.1
- [new tag] v4.13.2 → v4.13.2
- [new tag] v4.13.3 → v4.13.3
- [new tag] v4.13.4 → v4.13.4
- [new tag] v4.13.5 → v4.13.5
- [new tag] v4.13.6 → v4.13.6
- [new tag] v4.14.0 → v4.14.0
- [new tag] v4.14.1 → v4.14.1
- [new tag] v4.14.2 → v4.14.2
- [new tag] v4.14.3 → v4.14.3
- [new tag] v4.3.0 → v4.3.0
- [new tag] v4.4.0 → v4.4.0
- [new tag] v4.4.1 → v4.4.1
- [new tag] v4.4.2 → v4.4.2
- [new tag] v4.4.3 → v4.4.3
- [new tag] v4.4.4 → v4.4.4
- [new tag] v4.4.5 → v4.4.5
- [new tag] v4.4.6 → v4.4.6
- [new tag] v4.5.0 → v4.5.0
- [new tag] v4.5.1 → v4.5.1
- [new tag] v4.5.2 → v4.5.2
- [new tag] v4.5.3 → v4.5.3
- [new tag] v4.5.4 → v4.5.4
- [new tag] v4.5.5 → v4.5.5
- [new tag] v4.5.6 → v4.5.6
- [new tag] v4.5.7 → v4.5.7
- [new tag] v4.5.8 → v4.5.8
- [new tag] v4.5.9 → v4.5.9
- [new tag] v4.6.0 → v4.6.0
- [new tag] v4.6.1 → v4.6.1
- [new tag] v4.7.0 → v4.7.0
- [new tag] v4.7.1 → v4.7.1
- [new tag] v4.8.0 → v4.8.0
- [new tag] v4.9.0 → v4.9.0
- [new tag] v4.9.1 → v4.9.1
- [new tag] v4.9.2 → v4.9.2
- [new tag] v4.9.3 → v4.9.3
- [new tag] v5.0.0 → v5.0.0
- [new tag] v5.0.1 → v5.0.1
- [new tag] v5.0.10 → v5.0.10
- [new tag] v5.0.11 → v5.0.11
- [new tag] v5.0.12 → v5.0.12
- [new tag] v5.0.13 → v5.0.13
- [new tag] v5.0.14 → v5.0.14
- [new tag] v5.0.15 → v5.0.15
- [new tag] v5.0.16 → v5.0.16
- [new tag] v5.0.17 → v5.0.17
- [new tag] v5.0.18 → v5.0.18
- [new tag] v5.0.19 → v5.0.19
- [new tag] v5.0.2 → v5.0.2
- [new tag] v5.0.20 → v5.0.20
- [new tag] v5.0.21 → v5.0.21
- [new tag] v5.0.22 → v5.0.22
- [new tag] v5.0.23 → v5.0.23
- [new tag] v5.0.24 → v5.0.24
- [new tag] v5.0.25 → v5.0.25
- [new tag] v5.0.26 → v5.0.26
- [new tag] v5.0.27 → v5.0.27
- [new tag] v5.0.28 → v5.0.28
- [new tag] v5.0.29 → v5.0.29
- [new tag] v5.0.3 → v5.0.3
- [new tag] v5.0.30 → v5.0.30
- [new tag] v5.0.31 → v5.0.31
- [new tag] v5.0.32 → v5.0.32
- [new tag] v5.0.33 → v5.0.33
- [new tag] v5.0.34 → v5.0.34
- [new tag] v5.0.35 → v5.0.35
- [new tag] v5.0.4 → v5.0.4
- [new tag] v5.0.5 → v5.0.5
- [new tag] v5.0.6 → v5.0.6
- [new tag] v5.0.7 → v5.0.7
- [new tag] v5.0.8 → v5.0.8
- [new tag] v5.0.9 → v5.0.9
- [new tag] v5.1.0 → v5.1.0
- [new tag] v5.1.1 → v5.1.1
- [new tag] v5.1.2 → v5.1.2
- [new tag] v5.1.3 → v5.1.3
- [new tag] v5.1.4 → v5.1.4
- [new tag] v5.1.5 → v5.1.5
- [new tag] v5.2.0 → v5.2.0
- [new tag] v5.2.1 → v5.2.1
- [new tag] v5.2.2 → v5.2.2
- [new tag] v5.3.0 → v5.3.0
- [new tag] v5.3.1 → v5.3.1
- [new tag] v5.4.0 → v5.4.0
- [new tag] v5.4.1 → v5.4.1
- [new tag] v5.4.2 → v5.4.2
- [new tag] v6.0.0 → v6.0.0
- [new tag] v6.0.1 → v6.0.1
- [new tag] v6.0.2 → v6.0.2
- [new tag] v6.0.3 → v6.0.3
- [new tag] v6.0.4 → v6.0.4
- [new tag] v6.0.5 → v6.0.5
- [new tag] v6.0.6 → v6.0.6
- [new tag] v6.0.7 → v6.0.7
- [new tag] v6.0.8 → v6.0.8
- [new tag] v6.1.0 → v6.1.0
- [new tag] v6.1.1 → v6.1.1
- [new tag] v6.1.2 → v6.1.2
- [new tag] v6.10.0 → v6.10.0
- [new tag] v6.10.1 → v6.10.1
- [new tag] v6.10.2 → v6.10.2
- [new tag] v6.10.3 → v6.10.3
- [new tag] v6.10.4 → v6.10.4
- [new tag] v6.11.0 → v6.11.0
- [new tag] v6.12.0 → v6.12.0
- [new tag] v6.12.1 → v6.12.1
- [new tag] v6.12.2 → v6.12.2
- [new tag] v6.12.3 → v6.12.3
- [new tag] v6.12.4 → v6.12.4
- [new tag] v6.13.0 → v6.13.0
- [new tag] v6.13.1 → v6.13.1
- [new tag] v6.13.2 → v6.13.2
- [new tag] v6.13.3 → v6.13.3
- [new tag] v6.13.4 → v6.13.4
- [new tag] v6.13.5 → v6.13.5
- [new tag] v6.14.0 → v6.14.0
- [new tag] v6.14.1 → v6.14.1
- [new tag] v6.15.0 → v6.15.0
- [new tag] v6.15.1 → v6.15.1
- [new tag] v6.15.2 → v6.15.2
- [new tag] v6.15.3 → v6.15.3
- [new tag] v6.15.4 → v6.15.4
- [new tag] v6.16.0 → v6.16.0
- [new tag] v6.16.1 → v6.16.1
- [new tag] v6.16.2 → v6.16.2
- [new tag] v6.16.3 → v6.16.3
- [new tag] v6.16.4 → v6.16.4
- [new tag] v6.17.0 → v6.17.0
- [new tag] v6.17.1 → v6.17.1
- [new tag] v6.17.2 → v6.17.2
- [new tag] v6.17.3 → v6.17.3
- [new tag] v6.17.4 → v6.17.4
- [new tag] v6.17.5 → v6.17.5
- [new tag] v6.17.6 → v6.17.6
- [new tag] v6.18.0 → v6.18.0
- [new tag] v6.18.1 → v6.18.1
- [new tag] v6.19.0 → v6.19.0
- [new tag] v6.19.1 → v6.19.1
- [new tag] v6.19.2 → v6.19.2
- [new tag] v6.19.3 → v6.19.3
- [new tag] v6.2.0 → v6.2.0
- [new tag] v6.20.0 → v6.20.0
- [new tag] v6.20.1 → v6.20.1
- [new tag] v6.20.2 → v6.20.2
- [new tag] v6.21.0 → v6.21.0
- [new tag] v6.22.0 → v6.22.0
- [new tag] v6.22.1 → v6.22.1
- [new tag] v6.22.2 → v6.22.2
- [new tag] v6.22.3 → v6.22.3
- [new tag] v6.22.4 → v6.22.4
- [new tag] v6.22.5 → v6.22.5
- [new tag] v6.22.6 → v6.22.6
- [new tag] v6.22.7 → v6.22.7
- [new tag] v6.23.0 → v6.23.0
- [new tag] v6.23.1 → v6.23.1
- [new tag] v6.23.2 → v6.23.2
- [new tag] v6.23.3 → v6.23.3
- [new tag] v6.24.0 → v6.24.0
- [new tag] v6.24.1 → v6.24.1
- [new tag] v6.24.10 → v6.24.10
- [new tag] v6.24.2 → v6.24.2
- [new tag] v6.24.3 → v6.24.3
- [new tag] v6.24.4 → v6.24.4
- [new tag] v6.24.5 → v6.24.5
- [new tag] v6.24.6 → v6.24.6
- [new tag] v6.24.7 → v6.24.7
- [new tag] v6.24.8 → v6.24.8
- [new tag] v6.24.9 → v6.24.9
- [new tag] v6.25.0 → v6.25.0
- [new tag] v6.25.1 → v6.25.1
- [new tag] v6.25.2 → v6.25.2
- [new tag] v6.25.3 → v6.25.3
- [new tag] v6.25.4 → v6.25.4
- [new tag] v6.25.5 → v6.25.5
- [new tag] v6.25.6 → v6.25.6
- [new tag] v6.26.0 → v6.26.0
- [new tag] v6.26.1 → v6.26.1
- [new tag] v6.26.2 → v6.26.2
- [new tag] v6.26.3 → v6.26.3
- [new tag] v6.26.4 → v6.26.4
- [new tag] v6.26.5 → v6.26.5
- [new tag] v6.26.6 → v6.26.6
- [new tag] v6.27.0 → v6.27.0
- [new tag] v6.27.1 → v6.27.1
- [new tag] v6.27.10 → v6.27.10
- [new tag] v6.27.11 → v6.27.11
- [new tag] v6.27.12 → v6.27.12
- [new tag] v6.27.13 → v6.27.13
- [new tag] v6.27.14 → v6.27.14
- [new tag] v6.27.15 → v6.27.15
- [new tag] v6.27.16 → v6.27.16
- [new tag] v6.27.17 → v6.27.17
- [new tag] v6.27.18 → v6.27.18
- [new tag] v6.27.19 → v6.27.19
- [new tag] v6.27.2 → v6.27.2
- [new tag] v6.27.20 → v6.27.20
- [new tag] v6.27.21 → v6.27.21
- [new tag] v6.27.22 → v6.27.22
- [new tag] v6.27.23 → v6.27.23
- [new tag] v6.27.24 → v6.27.24
- [new tag] v6.27.3 → v6.27.3
- [new tag] v6.27.4 → v6.27.4
- [new tag] v6.27.5 → v6.27.5
- [new tag] v6.27.6 → v6.27.6
- [new tag] v6.27.7 → v6.27.7
- [new tag] v6.27.8 → v6.27.8
- [new tag] v6.27.9 → v6.27.9
- [new tag] v6.3.0 → v6.3.0
- [new tag] v6.4.0 → v6.4.0
- [new tag] v6.4.1 → v6.4.1
- [new tag] v6.4.2 → v6.4.2
- [new tag] v6.4.3 → v6.4.3
- [new tag] v6.4.4 → v6.4.4
- [new tag] v6.4.5 → v6.4.5
- [new tag] v6.4.6 → v6.4.6
- [new tag] v6.4.7 → v6.4.7
- [new tag] v6.4.8 → v6.4.8
- [new tag] v6.4.9 → v6.4.9
- [new tag] v6.5.0 → v6.5.0
- [new tag] v6.5.1 → v6.5.1
- [new tag] v6.5.2 → v6.5.2
- [new tag] v6.5.3 → v6.5.3
- [new tag] v6.5.4 → v6.5.4
- [new tag] v6.6.0 → v6.6.0
- [new tag] v6.6.1 → v6.6.1
- [new tag] v6.6.2 → v6.6.2
- [new tag] v6.6.3 → v6.6.3
- [new tag] v6.6.4 → v6.6.4
- [new tag] v6.6.5 → v6.6.5
- [new tag] v6.7.0 → v6.7.0
- [new tag] v6.7.1 → v6.7.1
- [new tag] v6.7.10 → v6.7.10
- [new tag] v6.7.11 → v6.7.11
- [new tag] v6.7.2 → v6.7.2
- [new tag] v6.7.3 → v6.7.3
- [new tag] v6.7.4 → v6.7.4
- [new tag] v6.7.5 → v6.7.5
- [new tag] v6.7.6 → v6.7.6
- [new tag] v6.7.7 → v6.7.7
- [new tag] v6.7.8 → v6.7.8
- [new tag] v6.7.9 → v6.7.9
- [new tag] v6.8.0 → v6.8.0
- [new tag] v6.8.1 → v6.8.1
- [new tag] v6.8.2 → v6.8.2
- [new tag] v6.9.0 → v6.9.0
- [new tag] v6.9.1 → v6.9.1
- [new tag] v6.9.2 → v6.9.2
- [new tag] v6.9.3 → v6.9.3
- [new tag] v7.0.0 → v7.0.0
- [new tag] v7.0.1 → v7.0.1
- [new tag] v7.0.10 → v7.0.10
- [new tag] v7.0.11 → v7.0.11
- [new tag] v7.0.12 → v7.0.12
- [new tag] v7.0.13 → v7.0.13
- [new tag] v7.0.14 → v7.0.14
- [new tag] v7.0.15 → v7.0.15
- [new tag] v7.0.16 → v7.0.16
- [new tag] v7.0.17 → v7.0.17
- [new tag] v7.0.18 → v7.0.18
- [new tag] v7.0.19 → v7.0.19
- [new tag] v7.0.2 → v7.0.2
- [new tag] v7.0.20 → v7.0.20
- [new tag] v7.0.21 → v7.0.21
- [new tag] v7.0.22 → v7.0.22
- [new tag] v7.0.23 → v7.0.23
- [new tag] v7.0.24 → v7.0.24
- [new tag] v7.0.25 → v7.0.25
- [new tag] v7.0.26 → v7.0.26
- [new tag] v7.0.27 → v7.0.27
- [new tag] v7.0.28 → v7.0.28
- [new tag] v7.0.29 → v7.0.29
- [new tag] v7.0.3 → v7.0.3
- [new tag] v7.0.30 → v7.0.30
- [new tag] v7.0.31 → v7.0.31
- [new tag] v7.0.32 → v7.0.32
- [new tag] v7.0.33 → v7.0.33
- [new tag] v7.0.34 → v7.0.34
- [new tag] v7.0.35 → v7.0.35
- [new tag] v7.0.36 → v7.0.36
- [new tag] v7.0.37 → v7.0.37
- [new tag] v7.0.38 → v7.0.38
- [new tag] v7.0.39 → v7.0.39
- [new tag] v7.0.4 → v7.0.4
- [new tag] v7.0.40 → v7.0.40
- [new tag] v7.0.41 → v7.0.41
- [new tag] v7.0.42 → v7.0.42
- [new tag] v7.0.43 → v7.0.43
- [new tag] v7.0.44 → v7.0.44
- [new tag] v7.0.45 → v7.0.45
- [new tag] v7.0.46 → v7.0.46
- [new tag] v7.0.47 → v7.0.47
- [new tag] v7.0.5 → v7.0.5
- [new tag] v7.0.6 → v7.0.6
- [new tag] v7.0.7 → v7.0.7
- [new tag] v7.0.8 → v7.0.8
- [new tag] v7.0.9 → v7.0.9
- [new tag] v7.1.0 → v7.1.0
- [new tag] v7.1.1 → v7.1.1
- [new tag] v7.1.10 → v7.1.10
- [new tag] v7.1.11 → v7.1.11
- [new tag] v7.1.12 → v7.1.12
- [new tag] v7.1.13 → v7.1.13
- [new tag] v7.1.14 → v7.1.14
- [new tag] v7.1.15 → v7.1.15
- [new tag] v7.1.16 → v7.1.16
- [new tag] v7.1.17 → v7.1.17
- [new tag] v7.1.18 → v7.1.18
- [new tag] v7.1.19 → v7.1.19
- [new tag] v7.1.2 → v7.1.2
- [new tag] v7.1.20 → v7.1.20
- [new tag] v7.1.21 → v7.1.21
- [new tag] v7.1.22 → v7.1.22
- [new tag] v7.1.23 → v7.1.23
- [new tag] v7.1.24 → v7.1.24
- [new tag] v7.1.25 → v7.1.25
- [new tag] v7.1.26 → v7.1.26
- [new tag] v7.1.27 → v7.1.27
- [new tag] v7.1.28 → v7.1.28
- [new tag] v7.1.29 → v7.1.29
- [new tag] v7.1.3 → v7.1.3
- [new tag] v7.1.4 → v7.1.4
- [new tag] v7.1.5 → v7.1.5
- [new tag] v7.1.6 → v7.1.6
- [new tag] v7.1.7 → v7.1.7
- [new tag] v7.1.8 → v7.1.8
- [new tag] v7.1.9 → v7.1.9
- [new tag] v7.2.0 → v7.2.0
- [new tag] v7.2.1 → v7.2.1
- [new tag] v7.2.10 → v7.2.10
- [new tag] v7.2.11 → v7.2.11
- [new tag] v7.2.12 → v7.2.12
- [new tag] v7.2.16 → v7.2.16
- [new tag] v7.2.2 → v7.2.2
- [new tag] v7.2.3 → v7.2.3
- [new tag] v7.2.4 → v7.2.4
- [new tag] v7.2.5 → v7.2.5
- [new tag] v7.2.6 → v7.2.6
- [new tag] v7.2.7 → v7.2.7
- [new tag] v7.2.8 → v7.2.8
- [new tag] v7.2.9 → v7.2.9
Requirement already satisfied: Pillow in ./env/lib/python2.7/site-packages
Requirement already satisfied: olefile in ./env/lib/python2.7/site-packages (from Pillow)
INFO:bench.app:pulling frappe
From GitHub - frappe/frappe: Low code web framework for real world applications, in Python and Javascript - branch master → FETCH_HEAD
Updating 830f22b…3b8a8c4
error: Your local changes to the following files would be overwritten by merge:
frappe/init.py
frappe/core/doctype/authentication_log/authentication_log.json
frappe/core/doctype/authentication_log/authentication_log.py
frappe/core/doctype/doctype/doctype.py
frappe/custom/doctype/customize_form/customize_form.py
frappe/public/js/frappe/form/toolbar.js
frappe/public/js/frappe/misc/number_format.js
frappe/public/js/frappe/ui/editor.html
frappe/public/js/frappe/views/breadcrumbs.js
frappe/public/js/frappe/views/reports/reportview.js
frappe/utils/init.py
frappe/website/js/website.js
Please commit your changes or stash them before you merge.
Aborting
Traceback (most recent call last):
File “/usr/local/bin/bench”, line 11, in
load_entry_point(‘bench’, ‘console_scripts’, ‘bench’)()
File “/home/frappe/.bench/bench/cli.py”, line 40, in cli
bench_command()
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 722, in call
return self.main(*args, **kwargs)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 697, in main
rv = self.invoke(ctx)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 1066, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 895, in invoke
return ctx.invoke(self.callback, **ctx.params)
File “/usr/local/lib/python2.7/dist-packages/click/core.py”, line 535, in invoke
return callback(*args, **kwargs)
File “/home/frappe/.bench/bench/commands/update.py”, line 62, in update
_update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force, reset=reset)
File “/home/frappe/.bench/bench/commands/update.py”, line 78, in _update
pull_all_apps(bench_path=bench_path, reset=reset)
File “/home/frappe/.bench/bench/app.py”, line 146, in pull_all_apps
remote=remote, branch=get_current_branch(app, bench_path=bench_path)), cwd=app_dir)
File “/home/frappe/.bench/bench/utils.py”, line 127, in exec_cmd
raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull upstream master