Git-Flow 规范和指令

# git tag v1.2.3 #你可以省略对这个tag的说明git tag -a v1.2.3 -m "This is comment" [<commit-id>]git push origin v1.2.3

## Features Added- add an new API `GET /projects/{projectId}/images` to get images [#<issue-id>](link for the issue) @GuanrongYang## Features Changed- save frame annotation in the API `PUT /projects/{projectId}/images/{imageId}/annotation` when saving damage annotation @GuanrongYang## Features Deprecated## Features Removed## Refactored## Bugs Fixed## Dependencies Added## Dependencies Changed## Dependencies Upgraded

[Unreleased]: https://github.com/guanrongYang/gitflow/compare/v1.0.2...develop
## Features Added- add an new API `GET /projects/{projectId}/images` to get images [#<issue-id>](link for the issue) @GuanrongYang
## Features Changed
## Features Deprecated
## Features Removed
## Refactored
## Bugs Fixed
## Dependencies Added
## Dependencies Changed
## Dependencies Upgraded

# ChangelogAll notable changes to this project will be documented in this file.
## [Unreleased]### Features Added- make download image more efficiently [#13870](https://github.com/spring-projects/spring-boot/pull/13870) @GuanrongYang
## [1.0.2] - 2017-06-20### Features Added- New visual identity by @tylerfortune8
### Features Changed- Start using "changelog" over "change log" since it's the common usage- Rewrite "What makes unicorns cry?" section
### Features Removed- Section about "changelog" vs "CHANGELOG" @Aboy @Bgirl
## [1.0.1] - 2015-12-03### Features Added- RU translation from @aishek- pt-BR translation from @tallesl- es-ES translation from @ZeliosAriex

## [1.0.0] - 2015-06-01### Features Added- ini the project @GuanrongYang
[Unreleased]: https://github.com/guanrongYang/gitflow/compare/v1.0.2...develop[1.0.2]: https://github.com/guanrongYang/gitflow/compare/v1.0.1...v1.0.2[1.0.1]: https://github.com/guanrongYang/gitflow/compare/v1.0.0...v1.0.1[1.0.2]: https://github.com/guanrongYang/gitflow/compare/v1.0.0...master

# 创建一个仓库mkdir gitflowcd gitflowgit init
touch README.md# ... 编辑 README.mdgit add README.mdgit commit -m "add README.md"
# 创建develop长期分支git checkout -b develop# develop分支必须先与feature分支推到远程仓库中git push origin develop# 获取远程仓库的develop分支到本地develop分支# git fetch origin develop:develop
# 在develop的基础上创建功能分支git checkout -b feature/baseinfo develop# ... 开发功能 feature/baseinfogit push origin feature/baseinfo# 合并开发好且通过测试的feature/baseinfo到developgit checkout developgit merge --no-ff feature/baseinfo
# 移除开发完成的功能分支feature/baseinfogit branch -d feature/baseinfo# 删除远程仓库的功能分支git push origin :feature/baseinfo
# ... 继续开发合并其他分支
# 预发布git checkout -b release/v0.1.0 developgit commit -a -m "initial version  v0.1.0"# ... 在release/v0.1.0上修改bugs
# 发布线上版本git checkout mastergit merge --no-ff release/v0.1.0# commit note: initial version v0.1.1git tag v0.1.0git push origin mastergit push origin v0.1.0
# 将release中修改过的代码合并到develop中git checkout developgit merge --no-ff release/v0.1.0
# 删除不需要的release分支# 删除本地release分支git branch -d release/v0.1.0# 删除远程release分支git push origin :release/v0.1.0
# 在线上发现一个Bug，需要紧急修复，一般来说，v0是还没有上线的版本git checkout -b hotfix/v0.1.0 master# ... 修复bugs# 重新发布一个版本，修订号加上1git checkout mastergit merge --no-ff hotfix/v0.1.0# commit note: bump version to v0.1.1git tag v0.1.1git push origin mastergit push origin v0.1.1
# 将hotfix分支合并到develop中，如果此时有未发布的release分支，则合并到release分支中git checkout developgit merge --no-ff hotfix/v0.1.0git push origin develop
# 删除hotfix分支git branch -d hotfix/v0.1.0git push origin :hotfix/v0.1.0

# 创建一个git项目，并创建master和develop分支git flow init# 初始的配置保持默认即可，这里保持分支命名规范与上面相同Initialized empty Git repository in /home/ygr/codes/github/gitflow2/.git/No branches exist yet. Base branches must be created now.Branch name for production releases: [master] Branch name for "next release" development: [develop] 
How to name your supporting branch prefixes?Feature branches? [feature/] Bugfix branches? [bugfix/] Release branches? [release/] Hotfix branches? [hotfix/] Support branches? [support/] Version tag prefix? [] Hooks and filters directory? [/home/ygr/codes/github/gitflow2/.git/hooks] 

# 在develop的基础上创建功能分支feature/baseinfo并切换过去git flow feature start baseinfo# =========上面指令等价于===========# git checkout -b feature/baseinfo develop# ================================
# ... 开发功能 feature/baseinfo# feature/baseinfo 开发完成git flow feature finish baseinfo# =========上面指令等价于===========# git checkout develop# git merge --no-ff feature/baseinfo# git branch -d feature/baseinfo# 如果远程仓库有feature/baseinfo，则会删除该远程分支# git push origin :feature/baseinfo# ================================git push origin develop
# 若需要将feature分支发送到远程仓库，可以使用如下指令git flow feature publish baseinfo# =========上面指令等价于===========# git checkout feature/baseinfo# git push origin feature/baseinfo# ================================

# 发布版本 v0.1.0，这里的版本号规范与上面保持一致git flow release start v0.1.0# =========上面指令等价于===========# git checkout -b release/v0.1.0 develop# ================================git flow release publish v0.1.0# =========上面指令等价于===========# git checkout release/v0.1.0# git push origin release/v0.1.0# ================================
# ... 修复所有bugs
# 发布到线上git flow release finish v0.1.0# =========上面指令等价于===========# git checkout master# git merge --no-ff release/v0.1.0# git tag v0.1.0# git checkout develop# git merge --no-ff release/v0.1.0# git branch -d release/v0.1.0# git push origin :release/v0.1.0# ================================git checkout mastergit push origin mastergit push origin v0.1.0git checkout developgit push origin develop

git flow hotfix start v0.1.1# =========上面指令等价于===========# git checkout -b hotfix/v0.1.1 master# ================================git push origin hotfix/v0.1.1
git flow hotfix finish v0.1.1# =========上面指令等价于===========# git checkout master# git merge --no-ff hotfix/v0.1.1# git tag v0.1.1# git checkout develop# git merge --no-ff hotfix/v0.1.1# git branch -d hotfix/v0.1.1# git push origin :hotfix/v0.1.1# ================================git checkout mastergit push origin mastergit push origin v0.1.1git checkout developgit push origin develop