Skip to content

add error code for UnresolvedConflicts#306

Merged
shiftkey merged 2 commits intomasterfrom
error-code-for-needs-merge
Feb 28, 2019
Merged

add error code for UnresolvedConflicts#306
shiftkey merged 2 commits intomasterfrom
error-code-for-needs-merge

Conversation

@shiftkey
Copy link
Member

If you are in a rebase or merge and have conflicts to resolve, this error is raised when there are unmerged files and you try to continue to complete the rebase/merge.

This feels more reliable than looking for exit code 1:

$ git rebase --continue
2-simple-rebase-conflict/LICENSE.md: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
$ echo $?
1

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

Successfully merging this pull request may close these issues.

1 participant