GitLab team collaboration

GitLab team collaboration

A member of

1. Creating the initial upload is complete warehouse project

2. A development function

3. Updates to the main branch (can also be incorporated in the development of the new branch)

   git add .
   git commit -m "更新描述"
   git push          #PS.如果是第一次更新需要使用 git push -u oringin 分支名字

4. Branch members agreed to merge two requests, dealing with conflict

Finally, the combined branch coverage to a local warehouse

git reset --hard HEAD

Two members

1. Clone project from the warehouse to the local

   git clone http链接

2. Development Function two

3. Create a new branch

   git branch 分支名字

4. Update Project to the new branch

   git checkout 分支名字    #转到新分支
   git add .
   git commit -m "更新描述"
   git push              #PS.如果是第一次更新需要使用 git push -u oringin 分支名字

5. The request to join a branch (branch after the merge entire functional)

Finally, the combined branch coverage to a local warehouse

git reset --hard HEAD