git-extract abort on conflict when cherry-picking