With GitHub Desktop 1.5, the app will list the files with conflicts, open your preferred editor to fix them, and let you know when everything is ready to merge.