git-workflows

For a small team deploying features daily, GitHub Flow or Trunk-Based Development is often the best Git workflow because they prioritize short-lived branches and continuous integration. This Skill provides decision frameworks to compare these models based on your specific release cadence and team size.

Choosing between Git Flow and Trunk-Based Development depends on your release strategy: Git Flow supports structured, scheduled releases with multiple versions in production, while Trunk-Based Development favors continuous deployment and smaller, faster updates. This Skill provides decision trees to map your team's needs to the right workflow.

You should use git rebase to maintain a linear project history by rewriting your feature branch commits, whereas a merge commit preserves the exact historical context of when branches diverged. This Skill details branching strategies to help you decide between rebase and merge based on your collaboration model.

Resolving Git merge conflicts during collaborative development requires identifying the conflicting code segments, manually editing the files to combine changes, and staging the resolved files to complete the merge. This Skill provides implementation guidance for conflict resolution and commit best practices.

The forking workflow is primarily designed for open-source collaboration where external contributors lack direct push access, rather than internal team collaboration. This Skill guides you through selecting the right workflow, detailing how forking compares to Trunk-Based or GitHub Flow for different project structures.

Setting up a Git branching strategy for a new open-source project involves adopting the forking workflow to manage external contributions and establishing a clear pull request process. This Skill guides your team to implement the appropriate contribution model and commit best practices.