[git flow]release

$ git log --oneline
2cdf082 (HEAD -> develop) feature4
9ffbff1 (origin/develop) conflict
...

 

release start

$ git flow release start 2cdf082         
Branches 'develop' and 'origin/develop' have diverged.
And local branch 'develop' is ahead of 'origin/develop'.
Switched to a new branch 'release/2cdf082'

Summary of actions:
- A new branch 'release/2cdf082' was created, based on 'develop'
- You are now on branch 'release/2cdf082'

Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:

     git flow release finish '2cdf082'

$ git branch
  develop
  master
* release/2cdf082

release start는 버전을 찍는 것이기 때문에, 이미 완료된 커밋만 release 할 수 있음.

(로컬)develop branch로 release branch를 땀.(- A new branch 'release/2cdf082' was created, based on 'develop')

 

finish

$ git flow release finish 2cdf082
// tag입력 후
Switched to branch 'develop'
warning: refname '2cdf082' is ambiguous.
warning: refname '2cdf082' is ambiguous.
Merge made by the 'recursive' strategy.
 minorfix1 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 minorfix1
Deleted branch release/2cdf082 (was 946a79d).

Summary of actions:
- Release branch 'release/2cdf082' has been merged into 'master'
- The release was tagged '2cdf082'
- Release tag '2cdf082' has been back-merged into 'develop'
- Release branch 'release/2cdf082' has been locally deleted
- You are now on branch 'develop'

$ git log --oneline
435563f (HEAD -> develop) Merge tag '2cdf082' into develop
1dfa183 (tag: 2cdf082, master) Merge branch 'release/2cdf082'
946a79d minorfix1
2cdf082 feature4
9ffbff1 (origin/develop) conflict
cba121c (origin/master) Merge branch 'develop' of D:\src\vscode\gitflow\server  
...

$ git branch
* develop
  master

finish하면 (로컬)develop, (로컬)master에는 merge 돼고, release branch는 삭제됌

(- Release branch 'release/2cdf082' has been merged into 'master')
(- Release tag '2cdf082' has been back-merged into 'develop')
(- Release branch 'release/2cdf082' has been locally deleted)

 

(로컬)master branch에 merge에는 tag가 달림

(- The release was tagged '2cdf082')