git flow상에서 develop으로부터 새로운 브랜치를 만들기

 

 

http://nvie.com/img/2009/12/Screen-shot-2009-12-24-at-11.32.03.png

 

 

 

현재 branch가 master이더라도 git flow release 하면, develop 브랜치로부터 만들어진다.

(master) $ git flow release start release-1.0.0 Switched to a new branch 'release/release-1.0.0' Summary of actions: - A new branch 'release/release-1.0.0' was created, based on 'develop' - You are now on branch 'release/release-1.0.0' Follow-up actions: - Bump the version number now! - Start committing last-minute fixes in preparing your release - When done, run:      git flow release finish 'release-1.0.0'

 

 

만들어둔 release branch를 git 서버에 push 한다.

(release/release-1.0.0) $ git push origin : release-1.0.0 Counting objects: 5, done. Delta compression using up to 4 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 314 bytes, done. Total 3 (delta 2), reused 0 (delta 0) remote: => Syncing Gitorious... [OK] To git 소스 * [new branch]      release/release-1.0.0 -> release/release-1.0.0

 

제대로 올라갔는지 확인

(release/release-1.0.0) $ git branch -r   origin/HEAD -> origin/master   origin/develop   origin/master   origin/release/release-1.0.0   origin/test

코드 수정 후 merging 작업

(master)  $ git rebase release/release-1.0.0

 

 

(git flow release finish 'release-1.0.0' 로 할 수 있으나,  운영관점에서 조금 더 rebase 하는 게 좋은 것 같다. finish 하면 사라지는 게 좀 걸림.. 나중에 잘 merging하고 서버에서 삭제하는 게 더 좋은 것 같음.)