git cherry-pick --strategy=recursive -X theirs
git reset --mergegit cherry-pick --strategyrecursive -X theirs CommittedID_2ndBranchgit diff --name-status --diff-filter
7月前760
Git合并冲突(Merge made by the 'recursive' strategy.)
E:phpStudyWWWvr>git branch -adevmaster* huaremotesoriginHEAD -> originmasterremotesorigindevremotesorigi
7月前720
git Merge made by the 'recursive' strategy
From gitee:xxxxxcms * branch develop -> FETCH_HEAD Merge made by the recursive strategy. apicontrol
7月前770