git cherry pick continue not working