Gitflow

Gitflow

Gitflow is a way to organize our work with git and repository.

Cabzza gitflow

Branch types

• bugfix,hotfix,feature,other
• develop
• master

Creating branches

When we are assigned to a task on JIRA, we have to create our own branch to work on it. The branch should be created from master branch. We should follow given naming convention: branch-type/JIRA-prefix description. For example (when task is a bug): bugfix/CAB-XX some description. When branch is created we have to pull it from the repository, and checkout on it.

In conclusion:

1. create branch
2. git pull in our local repo
3. git checkout branch name in local repo

Now we are on our own branch, ready to work. When yo end some part of you task - commit it and push to the repository:

1. git add files to add to he commit
2. git commit -m "Commit description"
3. git push

When your task is done, you should create two pull requests.

1. From your branch to develop
2. From your branch to master

Develop branch

This is the branch from which integration environment is being built. It's made for testing, so there can be some bugs. Pull requests to develop should be merged after code review

Master branch

Master branch is for stable environment. There are only tested things. Pull requests to master should be merged after someone tests the task on integration and approves it.