Git Development Cycle

remote repo:
git@git.tw:demo_repo

remote branch list:

• develop_demo_repo
• release_demo_repo

steps:

1. clone remote repo's release_demo_repo branch
   

   
   $ git clone -b release_demo_repo gitolite@git.tw:demo_repo demo_repo
   $ cd demo_repo
   
   

2. make new branchs local/hotfix/feature/anyone etc. and checkout it
   

   
   (release_demo_repo)$ git checkout -b hotfix
   
   

3. add/commit file changes
   

   
   (hotfix)$ touch index.php 
   (hotfix)$ git add index.php
   (hotfix)$ git commit -m "add index.php"
   
   

4. merge remote changes  into local develop_demo_repo
   

   
   (hotfix)$ git checkout develop_demo_repo
   (develop_demo_repo)$ git pull
   (develop_demo_repo)$ git merge --no-ff origin/develop_demo_repo
   
   

5. merge branchs local/hotfix etc.  into develop_demo_repo
   

   
   (develop_demo_repo)$ git merge --no-ff hotfix
   
   

6. push branch develop_demo_repo  to origin/develop_demo_repo
   

   
   (develop_demo_repo)$ git push origin develop_demo_repo
   
   

7. beta test
8. merge remote changes  into local release_demo_repo
   

   
   (develop_demo_repo)$ git checkout release_demo_repo
   (release_demo_repo)$ git pull
   (release_demo_repo)$ git merge --no-ff origin/release_demo_repo
   
   

9. merge branchs local/hotfix etc.  into release_demo_repo
   

   
   (release_demo_repo)$ git merge --no-ff hotfix
   
   

10. push branch release_demo_repo  to origin/release_demo_repo
    

    
    (release_demo_repo)$ git push origin release_demo_repo
    
    

11. online release
    
12. remove hotfix branch
    

    
    (release_demo_repo)$ git br -D hotfix
    
    

13. loop steps 2~12 to develop new feature