Skip to content

Instantly share code, notes, and snippets.

@githubteacher
Last active August 29, 2015 13:58
Show Gist options
  • Save githubteacher/9934845 to your computer and use it in GitHub Desktop.
Save githubteacher/9934845 to your computer and use it in GitHub Desktop.
Great Wide Open - Workflows, Collaboration & GitHub

Workflows & Collaboration

  • Merging
  • Dependencies across projeces
  • Forking vs. merging and cloning
  • Feature branching
  • Release management
  • Conflict resolution
  • Bug tracking
  • Sharing environment config
  • Pull request process
  • The nuclear option
  • Not just GitHub integration (CI, alternatives) (fundamentals of Git itself at tech)

Crafting & Navigation History

  • rebase or no?
  • squashing
  • pulling from upstream
  • cherry-pick
  • nuclear option
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment