Branching Strategy

Chosen strategy - Git Flow

---

We have next branches:

1. master
2. hotfix
3. release
4. develop
5. feature

All feature branches creates and merge only from/to develop branch.

Working process:

• Step 1
  • Clone this repo to your local computer using next command: git clone https://github.com/ita-social-projects/dokazovi-fe.git
• Step 2
  • Create new feature branch from develop branch using: git checkout -b issue_4_feature_name
  • Added new files and make commits to your feature branch using: git add .,git commit -m "commit message"
  • Push your feature branch to remote origin using: git push --set-upstream origin issue_4_feature_name
• Step 2.1
  • If remote develop is ahead of your local develop branch make git checkout develop and download new commits using: git pull
  • If your working branch need newest commits from local develop, stay on your working branch/or get back to your working branch and make merge using git merge develop
• Step 3
  • Make pull request to remote develop using dokazovi-fe
• Additional information
  • Guide about making correct issues/commits and pull requests

---

Visual representation of different strategies:

GitHub Flow

GitLab Flow

---

Useful links:

• Git branching strategies
• 4 branching workflows for Git
• One Flow strategy
• Branching стратегии в Git

Extenstion for Git Flow

• Git Flow extension

---

My presentation:

Presentation