Commits are dropped when continuing a cherry pick after conflict resolution
cjolowicz opened this issue · 0 comments
cjolowicz commented
When continuing after conflict resolution, only the current cherry pick is completed. Additional cherry picks are dropped silently.
Note that this is to be expected because cherry picks are invoked from a loop in Python, so git has no information that there are additional commits to be cherry picked.