开放原子开发者工作坊

个人对git的理解：

1. comit本地分支，将代码放在本地feature

2. co develop 切换分支（当前处于feature上，切换到自己的develop分支）

3. pull origin develop 获取最新代码（当前处于自己的develop分支上，从项目的develop分支上获取最新的代码）

4. co feature 切换回自己的feature，因为此时已经在自己的develop分支上获取了项目的最新代码

5. rebase develop 建立新的根基点

6. git flow feature publish 向master分支发送请求，项目管理者在master分支检查提交的内容决定是否进行merge。

 

图示：做不了图，只能这样了

 

master                                                                                                                                                                                                                                                                        6.将代码提交，管理者决定是否并入master

 develop（origin）                                                                                  3. develop（local）从develop（origin）获取最新代码

                                                                                                         3. pull origin develop

 develop（local）                                             2.切换到develop分支                                                                                                        4.co feature

                                                                   2.co develop                                                                                                                   4.切换回到feature

   feature                     1.代码提交到feature                                                                                                                                                                                  5.rebase develop                6.git flow feature publish

                                  1.comit