dev-public/doc-gitflow-workflow
18
0
Fork 0
Code Issues Pull Requests Projects Activity

Compare commits

base: dev-public:5af185395f50758ae0692155d0bdbb58a157ebf7
Branches Tags
dev-public:develop
...
compare: dev-public:bac244ddde778ea0b3ce44c11701d7c21654c7e1
Branches Tags
dev-public:develop

4 Commits
5af185395f ... bac244ddde

Author SHA1 Message Date
Le Hoang Nam
bac244ddde Merge pull request 'feature/doc-gitflow-wordflow' (#2) from feature/doc-gitflow-wordflow into develop 
Reviewed-on: #2
 2025-04-10 16:02:49 +08:00
Le Hoang Nam
7f7bfc6a30 Merge branch 'develop' into feature/doc-gitflow-wordflow 2025-04-10 16:02:31 +08:00
Le Hoang Nam
bec251d74e Clarify terminology for organization permissions in GitFlow documentation 2025-04-10 15:01:56 +07:00
Le Hoang Nam
edf2b5c2b9 Fix terminology for repository and branch permissions in GitFlow documentation 2025-04-10 14:59:28 +07:00
1 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

14
gitflow-workflow.md
View File

@ -10,13 +10,13 @@ GitFlow is a branching model for Git that helps teams manage feature development
## Organization Permissions:
✅ Only the HoD can create, modify, and delete organizations.\
✅ Only the Head of Department (HoD) can create, modify, and delete organizations.\
✅ Only the HoD can add teams and grant permissions for organizations. 
## Repository Permissions:
✅ Only the HoD and Leaders can create, modify, and delete repository.\
✅ Only the HoD and Leaders and Leaders can change settings for repository.
✅ Only the HoD and Team Leaders can create, modify, and delete repository.\
✅ Only the HoD and Team Leaders can change settings for repository.
## Branch Permissions
@ -25,14 +25,14 @@ GitFlow is a branching model for Git that helps teams manage feature development
- Prevent rewriting history.
- Prevent branch deletion.
- Prevent changes without a pull request.
- Limit write access to Leaders.
- Limit write access to Team Leaders.
### ✅ `develop` branch: development branch
- Prevent rewriting history.
- Prevent branch deletion.
- Prevent changes without a pull request.
- Limit write access to Game leaders.
- Limit write access to Team Leaders.
### ✅ Other branches
@ -61,7 +61,7 @@ Gitflow is really just an abstract idea of a Git workflow. This means it dictate
The `master` branch contains the latest updates for the project currently running in the LIVE environment.
Any changes to the `master` branch must be performed through a pull request. Leaders will review and merge the changes accordingly.
Any changes to the `master` branch must be performed through a pull request. Team Leaders will review and merge the changes accordingly.
![GitFlow Timeline](images/gitflow-workflow/master-branch-diagram.png)
## 2️⃣ Develop Branch
@ -70,7 +70,7 @@ Develop branch contains the complete history of the project and serves as an int
We will create the SAT (Site Acceptance Test) version on the `develop` branch and tag it with an updated version number. Once approved and deployed to LIVE, we will merge this confirmed version into the `master` branch.
Any changes for the `develop` branch must be performed through pull request. Leaders will review and merge the changes accordingly.
Any changes for the `develop` branch must be performed through pull request. Team Leaders will review and merge the changes accordingly.
![GitFlow Timeline](images/gitflow-workflow/develop-branch-diagram.png)