Git指南(4) - github协作

github添加合作者

collaborator中添加id

github collaborator 共享项目

git clone ...

git checkout -b collaborator

修改代码

git add ..

git commit -m 'xxx'

git push

        这个时候会报错

Everything up-to-date

        不能这么使用, 必须merge到master上再git push提交. 或者创建新的branch提交

1) merge master提交

git checkout master

git merge collaborator

git push origin master

2) 创建新branch提交

git push origin collaborator

    Username for 'https://github.com': zouzhicheng1983
    Password for 'https://zouzhicheng1983@github.com': 
    To https://github.com/youzhibicheng/git_test2.git
     * [new branch]      collaborator -> collaborator