Branching Strategies: Git Flow vs GitHub Flow 🎯

Welcome to CodeYourCraft! Today, we're diving into the world of branching strategies, specifically focusing on Git Flow and GitHub Flow. These strategies help us manage our projects effectively, especially in a team setting. Let's get started!

What are Branching Strategies? 📝

Branching strategies are methods used to manage different aspects of a project in separate branches. This allows us to work on new features, bug fixes, or other changes without affecting the main project.

Git Flow 💡

Introduction

Git Flow is a linear branching model, popular among large projects. It has specific branches for development, features, releases, and hotfixes.

Branches in Git Flow

1. master: This branch contains the production code. Only stable and tested code should be merged into the master.
2. develop: This branch is used for integrating new features and improvements.
3. feature/<feature-name>: These branches are created from the develop branch for implementing specific features.
4. release/<release-number>: These branches are created from the develop branch for preparing a new release.
5. hotfix/<hotfix-number>: These branches are created from the master branch to fix critical issues in production.

Workflow

1. Create a new feature branch from develop: git checkout develop; git checkout -b feature/my-feature
2. Work on the feature and commit changes: git add .; git commit -m "Add my feature"
3. Push the branch to GitHub: git push origin feature/my-feature
4. Create a pull request to merge the feature into develop.
5. Once the feature is reviewed and tested, merge it into develop.
6. Create a release branch from develop: git checkout develop; git checkout -b release/1.0.0
7. Prepare the release, fix any remaining issues, and test.
8. Once ready, merge the release branch into master and tag the release: git checkout master; git merge release/1.0.0; git tag v1.0.0
9. Push the changes to GitHub: git push origin master; git push origin v1.0.0

GitHub Flow 💡

Introduction

GitHub Flow is a simpler branching model, commonly used for smaller projects and teams. It relies heavily on pull requests for review and testing.

Branches in GitHub Flow

1. master: This branch contains the production code. Only merged pull requests from main branches should be in the master.
2. feature/<feature-name>: These branches are created for implementing specific features or fixes.

Workflow

1. Create a new feature branch from master: git checkout master; git checkout -b feature/my-feature
2. Work on the feature and commit changes: git add .; git commit -m "Add my feature"
3. Push the branch to GitHub: git push origin feature/my-feature
4. Create a pull request to merge the feature into master.
5. Once the feature is reviewed and tested, merge it into master.
6. Once merged, delete the feature branch.

Quiz 🎯

Practice Time 💡

Now that you understand the basics, try implementing these strategies in a small project. Practice makes perfect!

Stay tuned for more lessons on CodeYourCraft! 🚀