/git-workflow

outline the git-workflow

Git workflow

  • 4 persistent branches:

    1- master
    2- testing
    3- staging
    4- development

Feature/Issue workflow

  • each new feature/issue created with new branch forked from development:

      git checkout development
  git pull
  git checkout -b feature/my-awesome-feature

edit, commit, push your commits as needed:

    git add .  #select the needed files
    git commit -m 'commit message'
    git push --set-upstream origin feature/my-awesome-feature # first time only after that use git push

when you finish your work, pull the development branch and solve any conflicts:

    git pull origin development

then open a pull request to development branch

  • code will be peer-reviewed, when all issues are solved it will be merged on to development

  • after branch was merged, you can delete the local branch if you like:

      git checkout development  
  git branch -d feature/my-awesome-feature

Hotfix workflow

  • hotfixes are forked from staging or master as it requires:

      git checkout master  
  git pull  
  git checkout -b hotfix/fix-bug

when you finish your work, pull the master branch and solve any conflicts:

then open a pull request to master branch

  • code will be peer-reviewed, when all issues are solved it will be merged on to master, staging and development

  • after branch was merged, you can delete the local branch if you like:

      git checkout development  
  git branch -d hotfix/fix-bug