我如何大量挑选提交？

Question

In a team where 2 developers were working on different things, but both were using develop as the integration branch (working with gitflow) it turned out to be one developer's job is incomplete (but this job was not programmed for the current release) and the other is complete (this one is programmed for the current release).

Now, I'm trying to cherry pick every commit of the developer whose changes were programmed for the current release, but they are A LOT. My first thought was to cherry pick the commit of the pull request he submitted, but the parent for the cherry pick parameter is confusing, and it also brings some conflicts.

I'm not sure whether fixing these conflicts caused by cherry-picking the merge commit itself are worth it, or should I just cherry-pick one by one?

Answer 1

Write a 1-liner to get all "missing" revisions from the developer you want and cherry-pick them one by one (perhaps report and drop the ones that generate a conflict).

Roughly something like this (lots of details left out, for sure):

git log --pretty=%h whatever-conditions-to-get-list-of-revisions | while read revision; do git cherry-pick $revision; if [ $? -ne 0 ]; then echo "Revision $revision failed to be cherry picked.... stopping"; break; fi; done