1. Git-flow Branching Strategy
   • A team typically works using Git/Github, with team members creating Local repositories and Team Leaders creating Remote repositories. Team Leaders usually assign tasks for team members to complete.
   • The Main Branch is the primary container for production code. It is the initial branch that Git checks out locally when someone clones the repository, and it serves as the base for the production release.
   • The Develop Branch branches off the Main Branch, serving as a backup. It contains the latest work in progress and represents stable production code.
   • We create Feature branches in the Develop branch, where we work until it is ready to be merged into the Develop branch. These branches allow developers to work on particular features without affecting the main codebase.
   • A Release branch is created after development work is completed, serving as a temporary branch created to prepare for a new production release.
   • Bug-fix is started in the Release branch to ensure that the upcoming release is stable and free from critical issues.
   • Hot-fix is a branch used to solve critical issues or bugs in the live production version.
2. Details of the Git-flow Processing and Command
   • This section explains the process of creating a Remote repository, a Local repository, a Git-flow, a Feature branch, a Release branch, a Bug-fix branch from the Release branch, and a Hot-fix branch.
3. Process of Git-Flow Strategy
   • This section details the process of creating a Remote Repository, a Local Repository, and starting to work on the Feature branch, the Release branch and Bug-fix, and the Hot-fix branch.
4. Track Branch Method
   • This method is used to set up tracking for branches that have been created using Git Flow's feature, release, bug-fix, or hot-fix commands.
5. Merge Branch Method
   • Merging is a way to integrate changes from one branch into another. When a branch is merged into another branch, Git combines the changes from the source branch into the target branch.
6. Rebase Branch Method
   • Rebasing involves moving or "replaying" a series of commits from one branch into another branch's tip.
7. Reset/Revert Branch Method
   • First, get the hash of the branch, then use the command ç to reset.
8. Remote Alias, Commit History Method
   • Use git remote -v to show the alias of the repository (fetch, origin).
   • Use git log to show the commit history.

Conclusion-Git/GitHub

• The Git-Flow branching strategy offers a clear and organized approach to managing feature development, releases, and bug fixes. By utilizing branches such as main, develop, feature, release, bug-fix, and hot-fix, the project maintains a well-defined structure, enabling seamless integration of changes and ensuring the stability and reliability of the codebase.

Name Convention

1. Remote Repository:

   • Creating Issue and choosing label:
     • Feature branch:
       • Feature-Issue : issue description.
       • Details : describe about the problem in detail
     • Release branch:
       • Release-version : release description.
       • Details : describe about the problem in detail
     • Bug-fix branch:
       • Bugfix : issue description
       • Details : describe about the problem in detail
     • Hot-fix branch:
       • Hotfix : issue description
       • Details : describe about the problem in detail
   • Workspace setup:
     • Assign the one who work on the issue.
     • Set the situation of the issue.
     • Match the project.
     • After finish, assign the reviewer
     • Make a code review.

   <aside> 💡 Note: Pay attention to all aspects of the issue (title message, detail description, assigner, reviewer, label, project)

   </aside>

2. Local Repository:

   • Branching the branch:
     • Name the branch according to the actual problem and what to do with that branch.
     • Feature branch:
       • command e.g : git flow feature start nav-bar
         • result of naming : feature/nav-bar
     • Release branch:
       • command e.g : git flow release start 1.0
         • result of naming : release/1.0
     • Bug-fix branch:
       • command e.g : git flow bugfix start {the actual problem} release/{name of the release branch}
         • result of naming : bugfix/{bugfix branch name}
     • Hot-fix branch:
       • command e.g : git flow hotfix start {name of the released version (tag)}, e.g : 1.1
         • result of naming : hotfix/1.1

   <aside> 💡 Note: Everyone should name the branch according to the actual problem and what to do with that branch.

   </aside>

   • Commit message :
     • Commit branch :
       • feature : { describe about the problem in detail, which part you’ve worked on }
         • feature : home-page, add a menu button to navbar of home page.
       • release : { describe about the release version in detail }
         • release : release team website version 1.0
       • bugfix : { describe about the bug on the pre-release version }
         • bugfix : fixed the bug on pre-release version 1.0, error on register user account.
       • hotfix : { describe about the problem in detail, which part you’ve worked on and fixed }
         • hotfix : home-page, quick fix on released version 1.0, error on nav-bar and hero section.
       • refactor : { describe about the refactor version in detail }
         • refactor : refactor utils function using Class OOP ES6

   <aside> 💡 Note: Give a meaningful commit message.

   </aside>