Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

non-zero exit status 128 #187

Open
jeacott1 opened this issue Jul 30, 2021 · 2 comments
Open

non-zero exit status 128 #187

jeacott1 opened this issue Jul 30, 2021 · 2 comments

Comments

@jeacott1
Copy link

First time I tried this it failed due to me stupidly using a worktree.
with a fresh clone I got further, but still died.

Autofilling 6-145...Traceback (most recent call last):
File "...appdata\local\programs\python\python39\lib\runpy.py", line 197, in _run_module_as_main
return _run_code(code, main_globals, None,
...
appdata\local\programs\python\python39\lib\site-packages\gitimerge.py", line 230, in call_silently
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'checkout', '-f', '125bb7bd9ee8c7edc1ed6ca29d8b78c01d0db120']' returned non-zero exit status 128.

:(

@mhagger
Copy link
Owner

mhagger commented Aug 6, 2021

What happens if you execute that command manually just after the git-imerge failure:

git checkout -f 125bb7bd9ee8c7edc1ed6ca29d8b78c01d0db120

? Maybe its output would be illuminating.

@schwa
Copy link

schwa commented Aug 4, 2022

Same thing happens to me. Here's my (obfuscated sorry) response to the git checkout:

git checkout -f XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Warning: you are leaving 799 commits behind, not connected to
any of your branches:

  1XXXXXXXXX imerge '{{ my branch name }}': automatic merge 866-6
  2XXXXXXXXX imerge '{{ my branch name }}': automatic merge 865-6
  3XXXXXXXXX imerge '{{ my branch name }}': automatic merge 864-6
  4XXXXXXXXX imerge '{{ my branch name }}': automatic merge 863-6
 ... and 795 more.

If you want to keep them by creating a new branch, this may be a good time
to do so with:

 git branch <new-branch-name> b463a65fbe

HEAD is now at 5XXXXXXXXX XXXXXXXX

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants