Sometimes a long-running feature branch needs to be isolated from the main development effort. Explains how to minimize potential merge conflict when it's time to integrate those changes into the parent branch.