Git & Jira workflow

Remote repositories of android-home-dash-board

origin
|---- master
|---- HEAD
|---- bugfix
|---- feature
|       |---- HD-1464-update-smart-home-house-image
|----release
|       |---- R1802 (注:以Ryymm格式命名)

Use Git Feature Branch Workflow to develop:

  1. create a new branch every time they start work on a new feature. Feature branches should have descriptive names, like animated-menu-items or HD-1464-update-smart-home-house-image.
  2. edit, stage, and commit changes to a feature branch.
  3. push the feature branch to the central repository.
  4. create pull request in BitBucket dashboard

注:具体命令参考文后链接。特别注意create、push分支时,

git push -u origin new-feature

不要 origin/new-feature!

$ git checkout -b feature/HD-1464-update-smart-home-house-image
$ git commit -m "HD-1464: update Smart Home image"
$ git push -u origin feature/HD-1464-update-smart-home-house-image

关于 Jira Workflow:

  1. 新建分支后先在本地修改,把效果给QA确认,确认后状态可以更新为“Ready for Build”;
  2. 然后push代码,并新建PR,可更新为“Ready for Review”;
  3. 被核准merge后,可以更新为“Ready for Test”; assign给QA,并指明build number。