Sometimes, branching a new feature off of an existing one is necessary, but it often makes rebasing feel like a nightmare. In this post, I share my personal approach to keeping a clean project history when dealing with these “grandchild” branches.
