wiki.hjertnes.website

GitKraken

GitKraken is a Electron based Git client. I'd prefer a proper Mac app. But after trying many of them many times this is the best one I have found.

The UI makes a lot of sense to me.

But the thing that keeps me paying them, is how great the merge conflict resolution UI is.