git cherry-pick —— 团队中git merge时冲突——待续

Git cherry-pick

$ git log --branches=*feature/v1.2* --since 2020-04-20 --until 2020-04-23 --pretty=format:"%an %h %aD %s " --reverse |grep  -i  "[authorName]"

$ git cherry-pick 3a4adaae