accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-24 23:48:24 +00:00
Code Issues Releases Activity

[hotfix] fix update reset (#374)

Browse Source 
@rmehta
This commit is contained in:
robert schouten 2017-04-07 16:03:25 +08:00 committed by Rushabh Mehta
parent 2a5289fce8
commit c6e7477abf
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bench/app.py
View File

@ -137,6 +137,7 @@ def pull_all_apps(bench_path='.', reset=False):
rebase = '--rebase' if get_config(bench_path).get('rebase_on_pull') else ''
# chech for local changes
if not reset:
for app in get_apps(bench_path=bench_path):
app_dir = get_repo_dir(app, bench_path=bench_path)
if os.path.exists(os.path.join(app_dir, '.git')):
@ -150,7 +151,7 @@ Here are your choices:
1. Merge the {0} app manually with "git pull" / "git pull --rebase" and fix conflicts.
1. Temporarily remove your changes with "git stash" or discard them completely
with "git reset --hard"
with "bench update --reset" or for individual repositries "git reset --hard"
2. If your changes are helpful for others, send in a pull request via GitHub and
wait for them to be merged in the core.'''.format(app)
sys.exit(1)