This page collects links to all of the pages in the "Branching With Git And Testing With Pytest: A Comprehensive Guide" series.

• Part 1: Intro, Setup.

  In the first installment, we:

  • 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.

• Part 2: Branching, Tagging, Merging.

  In part two of the series:

  • 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.

• Part 2: Resolving Merge Conflicts.

  Wrapping up:

  • 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.