Gitflow Workflow - BKJackson/BKJackson_Wiki GitHub Wiki

Life Rules for using git

• Always work on a branch: git checkout -b my_branch_name. Delete branches once they are merged.
• Never push to master. Always work on a branch and do a pull request.
• Seriously, don't do work on master if you are collaborating with anyone.
• If you pushed it anywhere, or shared it with anyone, don't git rebase. In fact, if you're reading this, don't git rebase. Save that for when you are comfortable solving git merge nightmares on your own.

Some useful references if gitflow isn't second nature to you yet

• Introduction to GitHub tutorial: https://lab.github.com/githubtraining/introduction-to-github
• Git Handbook: https://guides.github.com/introduction/git-handbook/
• GitHub workflow cheatsheet: https://github.com/hackalog/bus_number/wiki/Github-Workflow-Cheat-Sheet

Git and teams

The Git workflow you need: How to deal with multiple teams in a single repository

More Gitflow Explainers

Gitflow Workflow Explained by Atlassian
Managing your Git branches with Git Flow
Gitflow is a Poor Branching Model Hack
Intro to Gitflow with Gitkraken
HubFlow: GitFlow For GitHub