GitHub Desktop 2.0 released. This new update allows you to resolve merge conflicts easily, comes with support for rebasing, stashing, and more.
It’s a common situation: you’re in the middle of reproducing and fixing a bug, and you need to switch context temporarily. Git branches are incredibly useful, but what do you do with your changes that are in progress? In Desktop 2.0, if you’re not ready to commit your work, you can choose to bring your changes to the new branch or keep them on your current branch.
Developers have also shared that many teams prefer a clean commit history without merge commits. This is a great example of where preferences dramatically differ. If you’re used to merging branches normally, you can still continue using the same workflow. But if you work in a repository where you don’t want those merge commits, Desktop 2.0 now supports rebasing to help you keep that commit history clean.
Looking forward, you can expect to see more in GitHub Desktop that surfaces context from GitHub.com to help make you even more productive on your local machine. We’re taking the first step by tightly integrating pull requests between GitHub and Desktop. You can easily open any pull request from GitHub.com in GitHub Desktop and have everything ready to go locally. You’ll be able to test things out, add more commits, or take a closer look at the code on your machine during a review.