Git Flow

A successful Git branching model

modified version

Branches

• Main branches
  • Production/release 對應到某個專案 (某塊板子) 的 release branch
  • Staging 對應到某個專案 (某塊板子) 的 dev branch
• Supporting branches
  • Features/Hotfixes...whatever 從 staging 分支出來的開發環境

Useful tool

• ungit

This model is flexible, just apply it in your own way.

Read more: Git flow 開發流程

GitLab

Self-hosted Git repository management

The term self-hosted also means to you everyone.

Creating a group

• For what?
• Who's the member?

Creating a repository

• Public or private?
• Permissions setup
• CLI tool: python-gitlab

Workflow

• The project maintainers get Master access and the regular developers get Developer access.
• The maintainers mark the authoritative branches as 'Protected'.
• The developers push feature branches to the project and create merge requests to have their feature branches reviewed and merged into one of the protected branches.
• Only users with Master access can merge changes into a protected branch.

Read more: Authorization for Merge requests

It's free and no pain to use it in your own way!