GitHub Desktop 2.0 expands to support stashing and rebasing
Resolve merge conflicts more easily, co-author commits to share credit with others, check out your GitHub pull requests, and more with the release of GitHub Desktop 2.0.

Source: The GitHub Blog
Resolve merge conflicts more easily, co-author commits to share credit with others, check out your GitHub pull requests, and more with the release of GitHub Desktop 2.0.