...
Let’s recap here how Git fits into the landscape and how it interact with other tools.
...
Local GIT repository:
...
Stored on DevOps/Source Collaboration platform.
Used for synchronization/cooperation among developers.
...
Pricefx Git Workflow
While implementing a solution, all developers should use the same common flow of work with Git. You can see all important aspects of the workflow in the picture.
If you are familiar with GitFlow, you will find this flow quite similar. The main reason for differences is that in Pricefx case, the configuration can only be tested against some partitions.
...
Note: Deployment to PROD is usually done during the GO LIVE preparation phase. So when it comes to the master branch, this This diagram demonstrates the situation mainly after GO LIVE and when additional sprints are planned. So during the development and , focusing on the master branch. During development, before the PROD environment is not established yet, the master branch is not maintained. It should be set to the corresponding version once the PROD evniroment get environment becomes available.
Branches
master – Used to store production version of the project. This version is also deployed on Production partition.
qa – Stores version of the project deployed on QA server which is tested by the customer. This version is also deployed on QA partition.
dev – The latest working version of development with all finished features.
feature/XXXX-XXXX – Keeps project version specific for development of one user story or feature. Each user story or feature (usually one JIRA ticket) should be versioned in one feature branch. The JIRA ticket number is then used as the name of the feature branch (the ticked ID is represented here by XXXX-XXXX). Every feature needs to be tested during the development on the customer-dev partition.
...