Answer the question
In order to leave comments, you need to log in
Cherry-pick phpstorm not working?
Good afternoon!
Can't cherry-pick from another branch.
I get an error:
your local changes would be overwritten by cherry-pick. hint: commit your changes or stash them to proceed. cherry-pick failed
Everything worked before. Please tell me what needs to be done
Answer the question
In order to leave comments, you need to log in
commit your changes or stash them to proceed
you have a conflict between uncommitted code and code from another branch
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question