开发中git的版本控制实战

下面的命令演示了从主分支拉取代码，创建分支，修改分支代码后合并到feature，并删除分支。

   git clone git@git.ucweb.local:jymall-app/jymall-android-master.git(拉取主分支)
   cd jymall-android-master/                                         (切换到工程目录)
   git branch                                                        (查看本地分支)
   git checkout -b dev/zyx_im_native2                                (新建本地分支)
   git branch                                                        (查看本地分支)
   git status                                                        (本地修改后查看状态)
   git add -A                                                        (本地修改加入git)
   git commit -m "test"                                              (本地修改入库)
   git push origin -u dev/zyx_im_native2                             (新建远程分支，并将本地新建分支推送到此分支)
   git branch                                                        (查看本地分支)
   git checkout feature                                              (切换到feature分支)
   git branch                                                        (查看本地分支)
   git merge dev/zyx_im_native2                                      (本地分支合并到feature)
   git mergetool                                                     (解决冲突)
   git commit -m "test"                                              (本地修改入库)

   git push origin feature                                           (合并分支后push到feature分支)

  git checkout   dev/zyx_im_native2                     (合并分支后切回当前分支)

如果不当前分支不需要了，则删除掉，如下

  git branch -D dev/zyx_im_native2                                  (删除本地分支)
  git push origin :dev/zyx_im_native2                               (删除远程分支)