Skip to content

tools: batch-rebase: Handle conflict while cherry picking last commit…

Douglas Raillard requested to merge github/fork/douglas-raillard-arm/_pr285 into master

… of topic

The cherry-picking session will be finished by git when committing the conflict resolution if that was the last commit of the topic. This will make a subsequent git cherry-pick --continue fail, which can be safely ignored.

Merge request reports