Advertisement
Guest User

Untitled

a guest
Aug 20th, 2017
71
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.22 KB | None | 0 0
  1. feature branches
  2. {
  3. # Create.
  4. git checkout -b project develop
  5. # Switched to a new branch "myfeature".
  6.  
  7. # Commit.
  8. git checkout develop
  9. # Switched to branch 'develop'.
  10. git merge --no-ff myfeature
  11. # Updating.
  12. git branch -d myfeature
  13. # Deleted branch myfeature.
  14. git push origin develop
  15. }
  16.  
  17. release branches
  18. {
  19. # Names policy: release-*
  20. git checkout -b release-1.2 develop
  21. # Switched to a new branch "release-1.2".
  22. # Execute script for bump.
  23. # ./bump-version.sh 1.2
  24. # Files modified successfully, version bumped to 1.2.
  25. git commit -a -m "Bumped version number to 1.2".
  26. # [release-1.2] Bumped version number to 1.2.
  27. # 1 files changed, 1 insertions(+), 1 deletions(-)
  28.  
  29. # Commit release.
  30. git checkout master
  31. # Switched to branch 'master'.
  32. git merge --no-ff release-1.2
  33. # Merge made by recursive.
  34. # Send report.
  35. git tag -a 1.2
  36.  
  37. # Back to develop.
  38. git checkout develop
  39. # Switched to branch 'develop'.
  40. git merge --no-ff release-1.2
  41. # Merge made by recursive.
  42. # Send report.
  43.  
  44. # Post delete release.
  45. $ git branch -d release-1.2
  46. # Deleted branch release-1.2.
  47. }
  48.  
  49. hotfix branches
  50. {
  51. # Create.
  52. git checkout -b hotfix-1.2.1 master
  53. # Switched to a new branch "hotfix-1.2.1".
  54. # ./bump-version.sh 1.2.1
  55. # Files modified successfully, version bumped to 1.2.1.
  56. git commit -a -m "Bumped version number to 1.2.1"
  57. # [hotfix-1.2.1] Bumped version number to 1.2.1.
  58. # 1 files changed, 1 insertions(+), 1 deletions(-)
  59.  
  60. # After fix.
  61. git commit -m "Fixed severe production problem"
  62. # [hotfix-1.2.1] Fixed severe production problem.
  63. # 5 files changed, 32 insertions(+), 17 deletions(-)
  64.  
  65. # Close hot fix.
  66. git checkout master
  67. # Switched to branch 'master'.
  68. git merge --no-ff hotfix-1.2.1
  69. # Merge made by recursive.
  70. # Send report.
  71. git tag -a 1.2.1
  72.  
  73. # Commit changes to develop.
  74. git checkout develop
  75. # Switched to branch 'develop'.
  76. git merge --no-ff hotfix-1.2.1
  77. # Merge made by recursive.
  78. # Send report.
  79.  
  80. # If release branche exists commit changes to realease branche.
  81.  
  82. # Delete hotfix branch.
  83. git branch -d hotfix-1.2.1
  84. # Deleted branch hotfix-1.2.1.
  85. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement