Skip to content

Instantly share code, notes, and snippets.

@franzwong

franzwong/branch.md

Created April 20, 2018 12:37
Show Gist options
  • Save franzwong/ed558eb27b2adc15a3925a5cccda818d to your computer and use it in GitHub Desktop.
Save franzwong/ed558eb27b2adc15a3925a5cccda818d to your computer and use it in GitHub Desktop.
Download ZIP
Raw
branch.md

Branches

Long life

  • master
  • dev

Short life

  • Release branch
  • Feature branch
  • Story branch

Development

Normal Flow

  1. Developer takes a ticket MRG-9999. The status of ticket becomes In progress.
  2. He creates a feature branch feature/MRG-9999 from dev
  3. He commits the change to feature/MRG-9999
  4. After he completes, he creates a pull request from feature/MRG-9999 to dev
  5. After he gets enough approval, he changes the status of ticket to Ready to QA.
  6. QA takes the ticket, assign to himself and change status to In QA.
  7. After QA completes, he changes the status to QA Complete.
  8. Developer can merge the change to dev.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment