If the pick cherry fails due to a merge conflict, it simply returns exit status 0.
Please do not tell me about --abort. I need to detect in a script if the original cherry pick command is not working.
Using git version 1.8.3.1 on CentOS 7.2.
EDIT: my script made cherry picks in if !, and I did not thenexit correctly in a non-zero output sentence . Sorry for the noise.
source
share