cherry-pic时的add by us / both modified / delete by us /delete by them