Git Diff and Patch
Last week I got myself into a complete git merge and rebase nightmare. It’s not all that unusual now that I’m using Git in the context of a team where we have multiple developers and branches at various steps removed...
git
A collection of 4 posts
Escaping Virtualenv Hell
Early in my developer career I was given some ‘rules’ for working with python that resulted in me having a near terror response whenever I considered starting a python project.
In-Situ Commit Squashing
Before creating a pull request you typically have to perform a rebase against the branch you are merging with (typically origin master), I’ve written a visual guide to that git-workflow process. Part of this rebase process allows you to cleanse...
Git Workflow Using Rebase and Squash - an illustrated git rebase workflow
For super clear details of a rebase workflow see this blog by Singlestone.