Neogit stuck on conflict state when trying to cherry pick #1755
Unanswered
AlejandroSanchez90
asked this question in
Q&A
Replies: 0 comments
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Uh oh!
There was an error while loading. Please reload this page.
-
i was learning how to cherry pick with neogit, not each time i try to cherry pick a commit from other brach, it says Cherry pick failed, resolve conflicts before continuing, i don't have any conflict and im allow to create cherry picks with the cli or ui, how do i fix this issue ?
this are the steps
i'm on the branch where i want to put my commits, i then hit l then o, pick the branch i want to harvest from, then hover over the target commit, and hit A and then A, then the error msg appears
Beta Was this translation helpful? Give feedback.
All reactions