Table of Contents Introduction A Git Branching Model from Vincent Driessen Drawbacks of Git Flow Improvements on Git Flow Continuous Integration (CI) and Continuous Delivery (CD) Semantic Versioning Git Tagging Git Tagging and Semantic Versioning in Practice How to Implement a Better Git Workflow Introduction In today’s fast-paced and ever-evolving software development landscape, Git, a version control system, plays a crucial role in enabling collaborative software development, tracking the entire history of codebase changes, and facilitating error recovery. It has become a must-know skill for every developer. One day, while initiating a personal project, I found myself pondering a question: Why am I using Git in this particular way? I realized that I didn’t want to convince myself with a reason of, “because everyone in my workplace uses this pattern.” It was time for me to truly understand Git and how to use it effectively in practice. In this guide, I would like to share my understanding of Git branching models, starting from the classic proposed by Vincent Driessen in 2010 and progressing to the more contemporary . I will analyze the drawbacks of Git Flow and demonstrate how GitHub Flow mitigates these issues. Additionally, I will introduce some practices, including / , , and . Git Flow GitHub flow Continuous Integration (CI) Continuous Delivery (CD) Semantic Versioning Git Tagging Throughout these discussions, I hope to provide insights on how to evaluate and improve your current Git workflow. By addressing unnecessary overhead in your development and release management processes, you can improve your productivity and enhance software delivery. https://youtu.be/Jsw-gGKZlQk?embedable=true A Git Branching Model from Vincent Driessen Vincent introduced a branching model that designates various branches, including (or ), , , , and , each with a specific purpose. Since the original post has already provided a detailed explanation of the workflow, I will focus on highlighting the key points of each branch and illustrating the relationships between them. main master develop feature release hotfix The branch represents the of the codebase. Each time changes are merged back into the branch, it signifies a new production release. On the other hand, the branch reflects the intended for the next release. Also, this is where nightly builds are built from. main production-ready state main develop latest changes To develop a new feature, it is recommended to create a branch by branching off from the branch. Once the feature implementation is complete, the branch should be merged back into the branch. feature develop feature develop A branch is created from the branch when the branch reaches the desired state for the new release. It is used to prepare for a new production release, incorporating bug fixes and last-minute changes. The branch is eventually merged into both the and branches, and a is added to the branch to . Merging the branch into the branch ensures that the branch includes any last-minute changes made in the branch. This ensures that future releases and feature implementations will also incorporate these changes. release develop develop release main develop tag main mark the release release develop develop release The branches are created to immediately address critical bugs in the branch, which represents the live production version. They are created from the on the branch corresponding to the production version. Once the hotfix is complete, it should be merged into both the and branches. The reason for merging it into the branch is to ensure that future releases also include the bugfix. hotfix main tagged commit main main develop develop However, if a branch exists, the hotfix changes should be merged into that specific branch instead of the branch because the fixes will eventually be merged into the branch when the branch is finished. Meanwhile, the upcoming release can also include the changes to fix the issues in the next production version. release release develop develop release Drawbacks of Git Flow Git Flow appears to effectively manage new feature development, bug fixes, and the creation of stable releases. However, reviewing the process once more, we can see that managing multiple branches in Git Flow can introduce complexity, especially when it comes to the process of releasing new features. The process of incorporating new features into a release can become complex when there is a need to release multiple features at the same time. Developers would have to check the branch, merge the release with the required features, and potentially exclude certain features, which can lead to increased coordination efforts and potential conflicts. develop Also, a branch can remain active for an extended period of time, and it gradually becomes a feature branch. As you start working on a new feature, you create a branch to implement it. However, as the development progresses, you encounter some challenges that require additional time and effort to overcome, such as dependency on external factors or the complexity of the feature. During this time, other changes are pushed to the branch, and the longer your branch exists, the greater the risk of encountering merge conflicts and difficulties in keeping the branch up-to-date. feature long-lived feature develop feature Moreover, in Git Flow, the integration and testing typically occur after branches are merged into the branch. This pattern introduces delays in the integration and testing phase, increasing the likelihood of encountering conflicts, compatibility issues, or bugs. Thus, it can lead to additional time spent on debugging and fixing issues. Moreover, the delay in testing can extend the feedback loop between developers and testers. feature develop Consequently, the software release process can be slowed down due to the overhead in the development process and extended feedback loop, which is not ideal for software development nowadays, which requires fast iteration and frequent small releases. Improvements on Git Flow As discussed above, the main drawbacks of Git Flow are the of its branching model and the . It also provides us with ideas to mitigate these problems. complexity delayed feedback loop A simpler branching model Testing at an early stage to shorten the feedback loop As an alternative, is a lightweight and flexible branching model that leverages the capabilities of Git and GitHub to provide a simplified development process with a focus on rapid iteration, continuous feedback, and frequent deployment. GitHub flow GitHub flow simplifies Git Flow’s branching model by eliminating the complexity associated with managing multiple branches such as , , and potentially . Instead, it emphasizes the use of feature branches for specific tasks or fixes. long-lived feature release hotfix Additionally, it promotes code reviews through the use of , allowing team members to provide feedback, suggest improvements, and catch potential issues earlier in the development cycle. Pull Requests (PR) Furthermore, it incorporates to enable on the code changes in the pull requests. This ensures that new features or fixes are thoroughly tested before they are merged into the main branch. Continuous Integration (CI) automated testing These practices simplify the branching model, making it easier to manage various branches and effectively shorten the feedback loop through pull requests and automated tests. Continuous Integration (CI) and Continuous Delivery (CD) Now, let’s shift our focus from the branching model to practices that can further streamline the development process and release management. As mentioned earlier, Continuous Integration automates testing to help developers identify issues early on. Continuous Integration refers to the practice of developers their changes . The purpose of CI is to the development and detect errors and problems as early as possible in the development process. testing and building code as frequently as possible shorten feedback loop CI is typically implemented using pipelines that or are when a developer pushes a code change. The code section below demonstrates a part of the CI pipeline that executes unit tests on code changes triggered by three events: 1.) push to the main branch, 2.) opening a pull request, and 3.) manual triggering. run periodically triggered name: unit-test

on:
  push:
    branches: [main]
  pull_request:
  workflow_dispatch:
  
env:
  POETRY_VERSION: "1.5.1"

jobs:
  build:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
        python-version: ["3.8", "3.9", "3.10", "3.11"]
        test_type: ["unit"]
    name: Python ${{ matrix.python-version }}
    steps:
      - uses: actions/checkout@v3
      - name: Set up Python ${{ matrix.python-version }}
        uses: "./.github/actions/poetry_setup"
        with:
          python-version: ${{ matrix.python-version }}
          poetry-version: "1.4.2"
          cache-key: ${{ matrix.test_type }}
          install-command: |
              if [ "${{ matrix.test_type }}" == "unit" ]; then
                echo "Running unit tests, installing dependencies with poetry..."
                poetry install
              fi
      - name: Run ${{ matrix.test_type }} tests
        run: |
          if [ "${{ matrix.test_type }}" == "unit" ]; then
            make test
          fi
        shell: bash In addition to executing automated tests, the CI pipeline can also automate the build process. By automating the build process, you can avoid the need for repetitive manual work to build artifacts, allowing developers to focus more on feature development. The abbreviation CD typically refers to Continuous Delivery or Continuous Deployment. Although these terms are often used interchangeably, in this guide, we distinguish between them as separate practices. Continuous Delivery refers to , specifically releasing it as a specific artifact. For instance, you can automate the process of distributing your build artifacts from the CI pipeline to designated locations like Docker Hub or PyPI. The objective of CD is to ensure the and . the ability to release code at any time frequent reliable release of your production-ready codebase Semantic Versioning Semantic Versioning is a versioning schema used for software that provides meaning to version numbers. It follows the format: . The purpose of semantic versioning is to provide developers, users, and systems with a clear understanding of the nature of changes between different versions of software. It allows developers to effectively communicate the impact and compatibility of new versions, making it easier for users to decide when to upgrade and ensuring compatibility with dependent libraries and systems. The provides a detailed guideline for creating version numbers. In simple terms, the version number follows these principles: MAJOR.MINOR.PATCH Semantic Versioning Specification ( SemVer ) MAJOR.MINOR.PATCH : Increment this number when making incompatible API changes. It indicates that the new version be backward compatible with the previous version. Major version changes often involve updates, redesigns, or new features. MAJOR may not significant : Increment this number when adding functionality in a backward-compatible manner. It indicates that the changes are added to the software in a way that with the previous version’s interface and functionality. MINOR maintains compatibility : Increment this number when making backward-compatible bug fixes. It indicates that the new version only includes fixes to address issues in the previous version without introducing new features or breaking changes. PATCH Git Tagging In Git, refers to the action of creating a that is associated with . A tag serves as a reference point that allows developers and users to easily identify and access specific versions of the codebase. In practice, people use this functionality to mark release points (i.e., when changes merged into the branch). tagging label a specific commit main In software release management, each tagged commit represents a stable and well-defined version of the software that is ready for deployment or distribution. It is recommended to tag a commit using a version number specified by the . As mentioned before, the version numbers help developers understand the impact and compatibility of a new release. Semantic Versioning Specification Git supports two types of tags: and . A lightweight tag is a simple pointer to a specific commit, while an annotated tag is an object that includes a and additional such as the tagger name, email, and date. It is recommended to create annotated tags so you can have all the information. lightweight annotated tagging message metadata Git Tagging and Semantic Versioning in Practice In many open-source projects, such as and , you can see is commonly used to manage package releases. TensorFlow React tag Without looking into the details of each release, we can gain a rough idea of the potential changes included in each release, such as new features or bug fixes, because of Semantic Versioning. How to Implement a Better Git Workflow? In this guide, we have explained a classic branching model, analyzed its drawbacks, and brainstormed about its improvement. Additionally, we have discussed practices such as CI/CD, Semantic Versioning, and Git tagging. When considering the implementation of a Git workflow, . Instead, careful analysis of project requirements is necessary. Factors to consider include project complexity, frequency of creating new releases, testing duration (e.g., testing a long-running data pipeline versus testing a connection to an external database), and more. it is important not to view a specific model or pattern as a one-size-fits-all solution Once the requirements have been listed, the selection of a suitable branching model can begin. The branching model is crucial as it defines how developers will manage feature implementation, bug fixes, and release creation. At this stage, it is worth considering whether modifications can be made to the existing model to further streamline the development and release lifecycle. In the meantime, the implementation of CI/CD practices should be taken into account, as the chosen branching model can influence the integration complexity of these practices. It is also essential to consider the advantages and disadvantages of the branching model. For instance, Git Flow provides segregation between the production-ready state of the codebase and feature development while also offering dedicated control over release creation. On the other hand, GitHub flow prioritizes agility over stability, enabling rapid iterations and frequent releases. By keeping these practices in mind and considering your specific requirements, I believe you can establish a better starting point for streamlining your development process and release management using Git.

Read My Stories

Too Long; Didn't Read

Making security fun one episode at a time

From Git Flow to CI/CD: A Practical Guide to Implement Git Workflow

Too Long; Didn't Read

Kevin Yang

About Author

TOPICS

THIS ARTICLE WAS FEATURED IN...

From Git Flow to CI/CD: A Practical Guide to Implement Git Workflow

Too Long; Didn't Read

Kevin Yang

About Author

TOPICS

THIS ARTICLE WAS FEATURED IN...

RELATED STORIES