What's in the Handbook?Schedule of Events
All About Chingu
Your Voyage
Pre-Voyage - Solo Project
Voyage - Team Project
Pair Programming Guide
Technical Resources
Choosing Your TechstackApp Mockup ToolsFonts, Icons, Images, & MoreSoftware LicensesGit - Defining a WorkflowGit - BranchesMaster BranchDevelopment BranchFeature BranchesGit - CommitsGit - Pull Requests
Project Resources
Glossary

Git Branches

Example Git Branching Diagram

Master Branch

The Master Branch always reflects a production ready state, and it is the branch that will be deployed to the production server. Only fully tested and approved releases are pushed to this branch. Only Project Match admins will be pushing to this branch.

Development Branch

The Development Branch is used for development of new features and integration of changes. Pull Requests are made from your local branches into the development branch, and it is only merged after it's checked by other members of the team.

Feature Branches

Feature branches are branched off from Development, and then merged back in once the feature is completed. All branches should following the naming convention, per the examples below:

Rules:

  1. Before you create a new branch or merge a branch, ensure that you pull changes from origin/development (central repository) to ensure that your local repository is up to date.
  2. Once you have merged your changes, ensure you push those to origin/development to make them available to the rest of the team.
  3. As you continue working on a branch, make sure you rungit pull origin development frequently (at least once a day) so that your branch doesn’t get left behind, and to decrease the likelihood of merge conflicts.
  4. Branch names should start with either bug, feature, refactor, or style.
  5. Descriptors should be hyphenated:
"bug/fixed-all-caps"
"feature/giant-duck-modal"
"refactor/add-prop-types"
"style/everything-is-black"
  • When several people are working on the same feature, it might be convenient to have personal feature branches and a team-wide feature branch. Merge, at will, the personal branches to the team-wide branch. Eventually, the team-wide branch will be merged to "master". Use the following naming convention:
$ git checkout -b feature-a/master # team-wide branch
$ git checkout -b feature-a/maria # Maria's personal branch
$ git checkout -b feature-a/nick # Nick's personal branch
  • Delete your branch from the upstream repository after it's merged, unless there is a specific reason not to.
Copyright2021 Chingu Cohorts