git merge --no-ff After resolving conflicts, will the history of the branch be gone?

Question

When Gitlab sends a merge request, there are conflicts that need to be resolved manually, and then I follow the steps as prompted

git fetch origin
git checkout -b develop origin/develop

git checkout master-clone
git merge --no-ff develop

git push origin master-clone

In this case, there will be no commit history of the develop branch in the master-clone branch?

Answer 1

对。

      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