Daily Archives: February 13, 2015

How was a cherry-pick conflict resolved ?

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: … Continue reading

Posted in git | Leave a comment