Feature branch workflow

Feature branch git workflow utilizing github projects.

1: Checkout master branch and update to latest version

1git checkout master
2git pull origin master

2: Create your new feature branch

1git checkout -b feature/GoodNameThatExplainsWtfIsBeingMadeInTheBranch
2Branch name examples:
3- feature/CreatePokemonView
4- feature/AddPokemon
5- feature/RemovePokemon

3: Implement the feature

  • Focus on implementing only one specific feature.
  • Be cautious about not creating conflicts.
  • If you feel like you have finished a part of your implementation, commit and push it to remote branch.
1git status
2git add filename
3git commit -m "Added a reset button"

4: Push feature branch to remote

1git push -u origin feature/BranchName

5: Create pull request to merge into master

This will create a card for your branch in the GitHub project under “in progress”

6: Merge pull request after receiving approvals