具有语义版本控制的git流修补程序
按照Jeff在的教程,我使用标准设置初始化git流:具有语义版本控制的git流修补程序,git,git-branch,git-flow,git-tag,Git,Git Branch,Git Flow,Git Tag,按照Jeff在的教程,我使用标准设置初始化git流: [~/tmp/test] $ git init Initialized empty Git repository in /Users/nrm/tmp/test/.git/ [~/tmp/test (master)] $ git flow init No branches exist yet. Base branches must be created now. Branch name for production releases: [ma
[~/tmp/test]
$ git init
Initialized empty Git repository in /Users/nrm/tmp/test/.git/
[~/tmp/test (master)]
$ git flow init
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/]
Release branches? [release/]
Hotfix branches? [hotfix/]
Support branches? [support/]
Version tag prefix? []
[~/tmp/test (develop)]
$
我将按照教程中的“热修复生产代码”部分进行操作。热修复程序分支的名称为“资产”:
但是,当热修复程序分支关闭时,教程声明热修复程序被标记为“0.1.1”。怎么会?我使用的是git-flow:stable 0.4.1
当我通过git flow hotfix finish'assets'
关闭修补程序时,标记等于修补程序分支名称:
$ git flow hotfix finish assets
^^^^^^
Switched to branch 'master'
Merge made by the 'recursive' strategy.
assets.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 assets.txt
Switched to branch 'develop'
Merge made by the 'recursive' strategy.
assets.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 assets.txt
Deleted branch hotfix/assets (was 08edb94).
Summary of actions:
- Latest objects have been fetched from 'origin'
- Hotfix branch has been merged into 'master'
- The hotfix was tagged 'assets'
^^^^^^^^^^^^^^^
- Hotfix branch has been back-merged into 'develop'
- Hotfix branch 'hotfix/assets' has been deleted
事实上,我想两者兼得。使用与标记名无关的字符串(如示例中的“资产”)命名修补程序分支。差不多
$ git flow hotfix finish assets --with-tag 1.0.1
导致
$ git flow hotfix finish assets --with-tag 1.0.1
Switched to branch 'master'
Merge made by the 'recursive' strategy.
assets.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 assets.txt
Switched to branch 'develop'
Merge made by the 'recursive' strategy.
assets.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 assets.txt
Deleted branch hotfix/assets (was 08edb94).
^^^^^^^^^^^^^
Summary of actions:
- Latest objects have been fetched from 'origin'
- Hotfix branch has been merged into 'master'
- The hotfix was tagged '1.0.1'
^^^^^
- Hotfix branch has been back-merged into 'develop'
- Hotfix branch 'hotfix/assets' has been deleted
^^^^^^^^^^^^^
有什么建议吗
$ git flow hotfix finish assets --with-tag 1.0.1
Switched to branch 'master'
Merge made by the 'recursive' strategy.
assets.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 assets.txt
Switched to branch 'develop'
Merge made by the 'recursive' strategy.
assets.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 assets.txt
Deleted branch hotfix/assets (was 08edb94).
^^^^^^^^^^^^^
Summary of actions:
- Latest objects have been fetched from 'origin'
- Hotfix branch has been merged into 'master'
- The hotfix was tagged '1.0.1'
^^^^^
- Hotfix branch has been back-merged into 'develop'
- Hotfix branch 'hotfix/assets' has been deleted
^^^^^^^^^^^^^