Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- feature branches
- {
- # Create.
- git checkout -b project develop
- # Switched to a new branch "myfeature".
- # Commit.
- git checkout develop
- # Switched to branch 'develop'.
- git merge --no-ff myfeature
- # Updating.
- git branch -d myfeature
- # Deleted branch myfeature.
- git push origin develop
- }
- release branches
- {
- # Names policy: release-*
- git checkout -b release-1.2 develop
- # Switched to a new branch "release-1.2".
- # Execute script for bump.
- # ./bump-version.sh 1.2
- # Files modified successfully, version bumped to 1.2.
- git commit -a -m "Bumped version number to 1.2".
- # [release-1.2] Bumped version number to 1.2.
- # 1 files changed, 1 insertions(+), 1 deletions(-)
- # Commit release.
- git checkout master
- # Switched to branch 'master'.
- git merge --no-ff release-1.2
- # Merge made by recursive.
- # Send report.
- git tag -a 1.2
- # Back to develop.
- git checkout develop
- # Switched to branch 'develop'.
- git merge --no-ff release-1.2
- # Merge made by recursive.
- # Send report.
- # Post delete release.
- $ git branch -d release-1.2
- # Deleted branch release-1.2.
- }
- hotfix branches
- {
- # Create.
- git checkout -b hotfix-1.2.1 master
- # Switched to a new branch "hotfix-1.2.1".
- # ./bump-version.sh 1.2.1
- # Files modified successfully, version bumped to 1.2.1.
- git commit -a -m "Bumped version number to 1.2.1"
- # [hotfix-1.2.1] Bumped version number to 1.2.1.
- # 1 files changed, 1 insertions(+), 1 deletions(-)
- # After fix.
- git commit -m "Fixed severe production problem"
- # [hotfix-1.2.1] Fixed severe production problem.
- # 5 files changed, 32 insertions(+), 17 deletions(-)
- # Close hot fix.
- git checkout master
- # Switched to branch 'master'.
- git merge --no-ff hotfix-1.2.1
- # Merge made by recursive.
- # Send report.
- git tag -a 1.2.1
- # Commit changes to develop.
- git checkout develop
- # Switched to branch 'develop'.
- git merge --no-ff hotfix-1.2.1
- # Merge made by recursive.
- # Send report.
- # If release branche exists commit changes to realease branche.
- # Delete hotfix branch.
- git branch -d hotfix-1.2.1
- # Deleted branch hotfix-1.2.1.
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement