fourcodes-org / proof-of-concepts

2 stars 1 forks source link

docs

meeting

git Release flow

git add index.json
git commit -m "added"
git tag -a v1.0 HEAD -m "v1.0 tag created"
git push origin v1.0
git checkout -b develop
git push --set-upstream origin develop
git checkout -b feature/v2.0
# Modify index.json file
git commit -am "v2.0 added"
git push --set-upstream origin feature/v2.0
# Create a pull request from feature/v2.0 into develop ( develop <= feature/v2.0 )
git checkout develop
git pull
git checkout -b Release/v2.0
git push --set-upstream origin Release/v2.0
git pull
# Create a pull request from Release/v2.0 into main
git checkout main
git pull 
git tag -a v2.0 HEAD -m "v2.0 tag created"
git push origin v2.0
git checkout -b Hotfix/v4.1
git commit -am "hotfix applied"
git push --set-upstream origin Hotfix/v4.1
git checkout main 
git pull
git checkout develop 
git pull

image

Workflow with Existing Branch Setup

1. Feature Development:

2. Merge to develop:

3. Deployment to Development Environment:

4. Merge to main:

5. Deployment to UAT and Production Environments: