Git on Caktus Group

How to Deploy Selectively to Production

Tue, 04 Mar 2025 11:00:00 +0000

Sometimes, it’s necessary to deploy a set of features and/or bug fixes to production before part of the current “testing” branch has been tested completely in a Q/A or staging environment.

Better Python Dependency Management with pip-tools

Tue, 18 Sep 2018 14:37:29 +0000

I recently looked into whether I could use pip-tools to improve my workflow around projects' Python dependencies. My conclusion was that pip-tools would help on some projects, but it wouldn't do everything I wanted, and I couldn't use it everywhere. (I tried pip-tools version 2.0.2 in August 2018. If there are newer versions, they might fix some of the things I ran into when trying pip-tools.)

When a Clean Merge is Wrong

Mon, 19 Mar 2018 13:30:00 +0000

Git conflicts tell us when changes don’t go together. While working with other developers, or even when working more than one branch by yourself, changes to the same code can happen. Trying to merge them together will stop Git in its tracks.