Skip to main content
Maintaining a clear branching strategy is crucial for code quality, streamlined collaboration, and faster delivery cycles. In this guide, we’ll cover:
  • Dedicated Feature Branches
  • Forking Model
  • Key Evaluation Factors
  • Feature Branch Workflow
  • GitHub Flow
  • Fork Workflow

​
Dedicated Feature Branches

Dedicated feature branches isolate new work from your main line of development. Each feature gets its own branch, ensuring:
  • Independent progress without blocking others
  • Cleaner history when merging completed features
  • Reduced risk of unstable code in the main branch
The image is a diagram illustrating dedicated feature branches in a version control system, showing a main branch with two feature branches labeled "Little Feature" and "Big Feature."

​
Forking Model

The forking model gives each contributor a personal copy of the central repo. Work happens in the fork, then changes are proposed back via pull requests. Benefits include:
  • Complete isolation of your changes
  • No need for direct push permissions on the upstream repo
  • A clear audit trail of contributions
The image illustrates a forking model, showing a cloud-based repository with folders and documents, indicating a separation between "Other's" and "Yours" sections. It includes icons representing a forked repository and a local machine.

​
Key Evaluation Factors

When selecting a branching workflow, weigh these core factors:

​
Feature Branch Workflow

A structured approach to developing and integrating features:
  1. Create a Feature Branch
    Name it clearly: feature/<feature-name>
  2. Commit Frequently
    Small, descriptive commits help with code review and history.
  3. Open a Pull Request
    Target the main or develop branch once your feature is functionally complete.
  4. Collaborate & Review
    Discuss changes in the PR, request feedback, and address comments.
  5. Deploy for Testing
    Push to a staging or QA environment to validate end-to-end.
  6. Merge & Cleanup
    Merge after passing CI checks and reviews, then delete the feature branch.
Use descriptive branch names (e.g., feature/user-auth) and follow your team’s prefix conventions (feature/, bugfix/, hotfix/).
The image illustrates a "Feature Branch Workflow" with six steps: Branch Creation, Committing Work, Pull Request Initiation, Code Discussion, Code Deployment, and Integration/Merge. Each step includes a brief description of the process involved.

​
GitHub Flow

GitHub Flow is a lightweight, branch-based workflow optimized for continuous delivery:
  1. Create a short-lived branch from main.
  2. Make your changes and commit often.
  3. Push the branch to GitHub.
  4. Open a pull request and request reviews.
  5. Merge to main when checks and reviews pass.
  6. Delete the branch after merging.
This flow emphasizes rapid feedback and always-deployable code.
The image illustrates the GitHub Flow Process in six steps: create a new branch, make changes, initiate a pull request, collaborate, merge the pull request, and delete the branch.

​
Fork Workflow

Common in open-source, the fork workflow keeps the central repository protected while enabling external contributions:
  1. Fork the upstream repository to your account.
  2. Clone your fork locally.
  3. Create a topic branch for your work.
  4. Commit changes and push to your fork.
  5. Open a Pull Request from your fork’s branch into the upstream repo.
Always sync your fork with the upstream main branch before starting new work to avoid merge conflicts.
The image illustrates a fork workflow in version control, showing the process of forking, cloning, editing, and pushing changes in a repository. It highlights the concepts of personal repository space, dual repository setup, and its common use in open-source projects.

Watch Video