Git merge code

Background:
Recent development needs, need another small partner Meien together to develop a project, the first time offsite and small partners to write code, Meien complete the project's other half, now I and Meien have written their own code, I need to merge the code, about git pull, merge, The push action records are as follows:

1,Meien operation :

In the Meien branch, push the Meien code to Meien's local git server

git push

2, my operation (I am the Master branch):

1 in my local switch to the Meien branch:

git checkout Meien

2) then pull the code above the Meien branch:

Git pull     has now pulled Meien's code to my own local git server.

3) Now merge my local code with the code above my git server

git merge Meien      so Meien code is merged with my local code.

4 Push the merged code to GitHub:

git push

PS: About merge, Branch creation and merging principle, Liao Xuefeng big guy has more detailed explanation:
Https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000/ 001375840038939c291467cc7c747b1810aab2fb8863508000

finally : This is a pleasant cooperation, but also the operation of the process recorded here, see for themselves, but also hope to help everyone.