Git Workflows

  1. Workflow for individuals
  2. Git workflows
  3. Centralized Workflow
  4. Repo start
  5. Developer A
  6. Developer B
  7. git pull (fetch+merge)
  8. Forgetting to rebase
  9. git pull --rebase (fetch+rebase)
  10. Resolve conflicts
  11. Conflicting patch
  12. Conflicting file
  13. Resolve conflicting file
  14. Continue rebase