Merge Request 时，冲突的解决步骤

git fetch 远程库git git rebase upstream/masterfetch 解决冲突it git rebase --continueast git push -fstream

>>阅读原文<<