被替换的分支叫bereplaced, 替换的分支叫replacer
git checkout replacer
git merge -s ours bereplaced
git checkout bereplaced
git merge replacer
git replace one branch with another
Guess you like
Origin http://10.200.1.11:23101/article/api/json?id=326612316&siteId=291194637
Ranking