Gitflow - ValentinMi/Choicy GitHub Wiki

Base

develop => Feature branch => PR to develop => develop => master

How to work on a feature

I have a ticket, his title is "Feature: Add login button to homepage".

  1. I pull develop git pull --rebase
  2. I create a new feature branch from develop with name feature/add_login_button_to_homepage
  3. I work on my branch
  4. Each days i pull & rebase develop on my feature branch to avoid too many changes and hard conflicts git checkout develop git pull --rebase git checkout - ("-" is equal to the previous branch i was before go on develop, so your feature branch) git rebase develop
  5. When i've finish my feature , i create a pull request to develop , i assign a reviewer and i move my tickets to "reviewing" column
  6. Pray to be approved
  7. If not , fix issues and restart to step 3.

How to commit

type(subject): my action exemple: feat(homepage): change heading color or fix(api-call): change api base url