Navigation: » Latest version
Owner: User #524297
Git Workflows
Choose the Git Workflow that works best for your team
Workflow |
Pros +++ |
Cons ---
|
Centralized |
- Easy to implement
- Closely replicates Subversion workflow
|
- Easy to have source conflicts in team
- Closely replicates Subversion workflow
|
Feature Branch |
- Separate development of individual features into branches
- Isolated branches allows developers to work independently
- Can use pull requests to merge code changes in a managed way
|
- Too many branches can become harder to manage
|
Git Flow |
- Strict branch-based management of feature development, releases, and hotfixes
- Goal of keeping
master clean, no broken builds
- Provides structure for larger projects
- Can use pull requests to merge code changes in a managed way
- Easy to implement with Git Tools for git
-
Built-in to Git Tools
|
- Can be more complicated
- Harder to implement in existing project
- Plugins require learning new git commands
- Works best with a Project Maintainer role
- Requires strict branch management
|
Forking |
- Easily accept input from large teams
- Easily accept input from untrusted contributors
- Good for loosely-knit teams
- Can use pull requests to merge code changes in a managed way
|
- Requires a Project Maintainer role
- Multiple repositories can impact disaster recovery
|
Best Suggestion: Use Pull Requests
('excerpt-include' missing)