git cherry-pick --strategy=recursive -X theirs

 

git reset --merge

git cherry-pick --strategy=recursive -X theirs CommittedID_2ndBranch

 git diff --name-status --diff-filter=U
 

git cherry-pick --abort