When a git cherry-pick fails because of a conflict, it can be resolved and committed. The reviewer is reminded that a conflict had to be resolved by the Conflicts section at the end of the message body:
commit 7b8e5c99a4a40ae788ad29e36b0d714f529b12eb Author: John SprayDate: Tue May 20 16:25:19 2014 +0100 ... Signed-off-by: John Spray (cherry picked from commit 1d9e4ac2e2bedfd40ee2d91a4a6098150af9b5df) Conflicts: src/crush/CrushWrapper.h
The difference between the original commit and the cherry-picked commit including the conflict resolution can be displayed with:
commit=7b8e5c99a4a40ae788ad29e36b0d714f529b12eb picked_from=$(git show --no-patch --pretty=%b $commit | perl -ne 'print if(s/.*cherry picked from commit (\w+).*/$1/)') diff -u --ignore-matching-lines '^[^+-]' \ <(git show $picked_from) <(git show $commit)
Continue reading "How was a cherry-pick conflict resolved ?"