GitHub Desktop 1.5 available today
Merge with confidence using GitHub Desktop 1.5, knowing that even if merge conflicts occur, we’ll help you through it so you can keep shipping.

Source: The GitHub Blog
Merge with confidence using GitHub Desktop 1.5, knowing that even if merge conflicts occur, we’ll help you through it so you can keep shipping.