Skip to content

Instantly share code, notes, and snippets.

@agconti

agconti/git-workflow.md

Last active August 29, 2015 14:25
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save agconti/5f97f13108b3d451c82a to your computer and use it in GitHub Desktop.
Save agconti/5f97f13108b3d451c82a to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-workflow.md

Goal

Make an ansychrous workflow that allows the team to collaborate seemlessly, on their terms.

Background

What we had

Git Flow

  • You've probably used to it.
  • Focuses on local branches and workflow.
  • Doesn’t focus on team collaboration, code review, or continuous deployment.

gitflow

Lots of distrbuted tools like Jira, Pivotal Tracker, Trello, Email.

Information is everywhere. No one has the whole picture. Its hard to collet and stay up to date.

Move to GitHub flow

  • Focuses on team collaboration by heavily leveraging GitHub and its tools.
  • Allows for a highly visible and transparent code base through code reviews.
  • Allows you to constantly deploy

GitHub Flow

Essentially boils down to:

flow

Taking it a step forward:

Consistent git commits

  • feat(folder/file): what you did
  • fix(folder/file): what bug you squashed
  • docs(folder/file): what you learned
  • test(folder/file): things that won’t break

Rebase workflow

rebase1 rebase2

Pros:

  • Clear linear git history
  • Git history shows a meaningful increment of completed features and functionality.
  • Indispensable on live products since you’ll be able to safely rollback deployed changes if there are bugs.

Release Check lists

checklists

Sprint planning via milestones

Issue triage via labels

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment