nodegit: Conflicts prevent checkout
During repository.checkoutRef I get “X conflicts prevents checkout”.
This error is that silly, that it appers not only in my app, but in GitKraken too. Moreover, I cannot reproduce this with CLI git checkout. No conflicts at all.
It appears on most of my local repos, both in my app and GitKraken.
Anybody knows anything about that? I’m glad to provide more details, but I need to know, what one may require.
About this issue
- Original URL
- State: open
- Created 6 years ago
- Reactions: 1
- Comments: 15 (2 by maintainers)
Came across a similar problem today in GitKraken, here’s my situation: I selected different commits, for a Cherrypick commit, but then I got a conflict. I then reverted the changes manually. When I tried checking out to another branch I got OP similar error description “there’s unresolved conflicts on index…cannot checkout…bla”. Although “git status” showed me that the repo was clean and there were no changes to be stashed or commited.
After a executing a Pull (rebase), and trying to checkout to another branch it worked normally.