Git Articles

  1. Branching With Git And Testing With Pytest: A Comprehensive Guide: Part 3

    This is part three of a three-part series. This is a comprehensive guide to a basic development workflow. Using a simple, but non-trivial web application, we learn how to write tests, fix bugs, and add features using pytest and git, via feature branches. Along the way we'll touch on application design and discuss best practices.

    In this installment, we will:

    • Simulate collaborative work by two developers.
    • Use the workflow we learned in part 2 to add a new feature, and fix a new bug.
    • Create a merge conflict and resolve it.

  2. Branching With Git And Testing With Pytest: A Comprehensive Guide: Part 2

    This is part two of a three-part series. This is a comprehensive guide to a basic development workflow. Using a simple, but non-trivial web application, we learn how to write tests, fix bugs, and add features using pytest and git, via feature branches. Along the way we'll touch on application design and discuss best practices.

    In this installment, we will:

    • Identify and fix a bug on a branch.
    • Build a new feature, also on a branch.
    • Use git rebase to keep our change history tidy.
    • Use tagging to mark new versions of our application.

  3. Branching With Git And Testing With Pytest: A Comprehensive Guide

    This is part one of a three-part series. This is a comprehensive guide to a basic development workflow. Using a simple, but non-trivial web application, we learn how to write tests, fix bugs, and add features using pytest and git, via feature branches. Along the way we'll touch on application design and discuss best practices.

    In this installment, we will:

    • Talk a bit about the design of the example application.
    • Ensure we are set up for development.
    • Exercise the basics of pytest, and git by writing some tests, adding a fixture, and committing our changes.