Skip to content

Instantly share code, notes, and snippets.

@saravanapriyanm

saravanapriyanm/git-workflow.md

Created November 24, 2022 05:41
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save saravanapriyanm/9f81ecb063a557a0ce37c9f1d757edc9 to your computer and use it in GitHub Desktop.
Save saravanapriyanm/9f81ecb063a557a0ce37c9f1d757edc9 to your computer and use it in GitHub Desktop.
Download ZIP
GIT Workflow
Raw
git-workflow.md

Git Workflow

Commit Title Prefixes ➕

For bug fixes

fix: <bug fix description>

For new features

feat: <feature description>

For Config changes(API endpoints, Authentication...)

config: <config description>

When committing incomplete or breaking changes:

INCOMPLETE: <incomplete changes description>

Work flow 🏗️

When starting to work on a new change, follow these steps:

  1. Create a branch from master(or main) named <User>/<feature>.

  2. Make code changes & create a Pull request to Stage.

    2.1 : If merge conflict happens, create a new branch from Stage named <User>/Stage/<feature>.

    2.2 : Merge the master based branch to stage based branch and resolve conflicts.

    2.3 : Create a new pull request to stage from stage based branch.

    2.4 : Abandon the master based branch pull request.

  3. If any bugs are assigned, use the same branch and repeat step 2 for pull requests.

  4. When ready for production, create a pull request to master(or main) from the master based branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment