Branching Strategy

Chosen strategy - Git flow

We have main and dev branches. All feature branches must be merged into dev branch!!! Only the release should merge into the main branch!!!

Working process:

Step 1

• Option 1

  • 👯 Clone front-end or back-end repo to your local machine using git clone

• Option 2

  • Create new feature branch from develop branch using: git checkout -b issue_4_feature_name

Step 2

• 💅🏼 Add new files and make commits to your feature branch using: git add ., git commit -m "commit message"

Step 3

• 🐇 Push your feature branch to remote origin using: git push issue_4_feature_name

Step 4

• If remote develop is ahead of your local branch download new commits using: git pull

Step 5

• 🔃 Create a new pull request and asign at least 2 people to check your changes in order to merge it

Useful links about branch:

Git workflow