Through the use of Git’s interactive rebase feature, I will squash both the develop and feature branches down to one commit. A post-squash merge will then bring both develop and feature branches into ...

GitHub Desktop 2.0, an upgrade to the GitHub client for Windows and MacOS, adds support for rebasing and stashing to allow context switches and keeping a commit history clean, respectively.