How to commit or stash changes

Install / Update
1 
From https://github.com/frappe/erpnext
 * branch            develop    -> FETCH_HEAD
Updating 8ed2f87..18f622f
error: Your local changes to the following files would be overwritten by merge:
	erpnext/hooks.py
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
  File "/usr/local/bin/bench", line 9, in <module>
    load_entry_point('bench==2.1.0', 'console_scripts', 'bench')()
  File "/home/vhrs/bench-repo/bench/cli.py", line 40, in cli
    bench_command()
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 716, in __call__
    return self.main(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 696, in main
    rv = self.invoke(ctx)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 1060, in invoke
    return _process_result(sub_ctx.command.invoke(sub_ctx))
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 889, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 534, in invoke
    return callback(*args, **kwargs)
  File "/home/vhrs/bench-repo/bench/commands/update.py", line 61, in update
    _update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force)
  File "/home/vhrs/bench-repo/bench/commands/update.py", line 77, in _update
    pull_all_apps(bench=bench_path)
  File "/home/vhrs/bench-repo/bench/app.py", line 104, in pull_all_apps
    exec_cmd("git pull {rebase} upstream {branch}".format(rebase=rebase, branch=get_current_branch(app, bench=bench)), cwd=app_dir)
  File "/home/vhrs/bench-repo/bench/utils.py", line 100, in exec_cmd
    raise CommandFailedError(cmd)
bench.utils.CommandFailedError: git pull  upstream develop
2

If you want to commit do the following:

git add -A
git commit -a -m’YOUR OWN MESSAGE’

If you want to stash them

git stash

Nothing more.

1 Like
3

Thanks for the info…
if I given commit means what effects it create where do I find the committed changes

4

Yes Exactly.
Commit for updates.
-a : amend
-m : message

Add git add -A for dealing with new files you have added before.

1 Like