gitlab解决冲突(拉取到本地)

第一步:Fetch and check out the branch for this merge requestgit git fetch origin git checkout -b 你的分支 origin/你的分支 第二步: Review the changes locally 第三步:Merge the branch and fix any conflicts that come upwe

>>阅读原文<<