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.

Sign up for GitHub

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

Jump to bottom

commit on the last commit of of the set corrupts state #4

Open

brooksdavis opened this issue Feb 24, 2017 · 0 comments

Owner

brooksdavis commented Feb 24, 2017

If you commit the last commit of the merge, the merge isn't marked finished and continue does:

$ mergify continue
cat: .git/MERGIFY_CURRENT_HASH: No such file or directory
mergify: resuming merge at
mv: rename .git/MERGIFY_CURRENT_HASH to .git/MERGIFY_LAST_MERGED_HASH: No such file or directory
mergify: internal error: reached last hash, but not at ###########

The text was updated successfully, but these errors were encountered:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment