Branching Strategy

Chosen strategy - Git Flow

---

We have the next branches:

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

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

Working process:

• Step 1

  • Clone this repo to your local computer using the next command: git clone https://github.com/ita-social-projects/dokazovi-be.git

• Step 2

  • Create new feature branch from develop branch using: git checkout -b issue_4_feature_name
  • Add 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 issue_4_feature_name
  • If remote develop is ahead of your local branch download new commits using: git pull

• Step 3

  • Make a pull request (PR) to remote develop using dokazovi-be
  • Importantly:
    • in the case of PR to master/release branch - use command: merge!
    • in the case of PR to develop/hotfix branch - use command: squash and merge!

• 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