Feature Branches

Git Workflow For Feature Branches

Please follow these steps each day you sit down to work on a new feature.

We highly recommend using gitKraken

Find Something To Do

• Head over to the Glo board and find something off the TODO or Issues section.

You Found Something To Do

• Let the team know what you decided to work on.
• Hop back over to the glo board.
• Assign yourself to that task.
• Drag that task to In Progress.
• Make note of or copy the unique id on the bottom left or top right of the task.

Regular todo's will be COD-# and issues will be #number

Pull The Latest Code

• Make sure you don't have any random changes and pull the latest code.

$ git status
$ git checkout development
$ git pull

Create your feature branch

• Please create a new branch for your new task.

You will now use that unique id from the glo board

$ git checkout -b card-name
OR
$ git checkout -b issue#number

Examples:

$ git checkout -b COD-10
OR
$ git checkout -b issue#5

CODE!

• Your free to code. We appreciate your help.
• Don't be scared to commit as much as you want during your feature branch.

You Finished your new changes, lets push it

• Make sure you have working code before pushing!
• Check to make sure you don't have any last minute commits and then push it to github.

$ git status
$ git push origin branch-name
OR
$ git push origin issue#number

Example Push.

$ git status
$ git push origin COD-10
OR
$ git push origin issue#5

Create a Pull Request

• Hop onto github and click compare & pull request.
• While on the Open a pull request page, change the title.
  • Add your branch name in brackets to the title.

  Example Title: [COD-10] Converted ternary to if/else.

  • Edit the existing description

  Example Description:

  Fixes issue#36
  
  Changes proposed in this pull request:
  - removed styles from timer. Fixes issue #36.
  - added countdown timer, so the alarm doesn't scare Chris Nickel
  - turned off autocomplete for inputs
  

• Click create pull request.
• Go back to the Glo board and assign that pull request to your card.
• Please let the team know you have created the pull request.
• Your code will go through a review before being merged.
  • If all the code checks off it will be merged in, and you will automatically be notified via email of the merge.
  • If there is some changes that the reviewer requests, you will be notified via email. Please make the requested changes and commit/push your code.
    • You have the ability to respond to these comments within the pull request. You also have the ability to resolve these conversations, but it is best to let the reviewer resolve them. Also don't hesitate to open a slack or zoom call with the reviewer to discuss the changes in further detail.
  • Once your code has passed the review process it will be merged in.

Final Steps

• After your branch has been merged in you can safely delete your local branch
  • Please make sure you have no random changes on your branch first then checkout the development branch and pull the latest code.

$ git status
$ git checkout development
$ git pull

YOU DID IT!!!! Thank you!

Back To Top