84669 person learning
152542 person learning
20005 person learning
5487 person learning
7821 person learning
359900 person learning
3350 person learning
180660 person learning
48569 person learning
18603 person learning
40936 person learning
1549 person learning
1183 person learning
32909 person learning
Gitlab发merge request的时候，有冲突需要手动解决，然后我按照提示的步骤
git fetch origin git checkout -b develop origin/develop git checkout master-clone git merge --no-ff develop git push origin master-clone
这样的话在master-clone这个分支就没有develop分支的提交历史了吗？
对。
A---B---C develop / D------------ master
git merge --no-ff develop
A---B---C develop / \ D-----------E---F master
git merge develop
A---B---C develop / D-A---B--C--E---F master
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
对。
git merge --no-ff develop
git merge develop