git-workflow

Git workflows for projects

The goal of this library of documents be a quick reference, yet thorough and concise enough to help someone new to working with git adapt to how one should work with git. The information in this repository should give people enough information to be able to google for topics not covered here. Specifics will be in their respective folders.

Installing and Setting up Git

Workflow

• Single-Repo
• Multi-Repo (Forking)

General Information

• Machine Setup
• Conflict Resolution
• Undoing
• Local Status

Todo

• Higher Quality Pictures
• Multi-repo workflow
• Cover additional scenarios
  • Simultaneous Development
  • Submitting For Review (Pull Requests)
  • Merging
  • Releasing
  • Emergency!
    • Hotfixes
    • Lost Code
      • Recovery
  • Continuous Integration Strategies