I like the merge tool i Gitkraken, it makes it easy to choose one side for each conflict or edit the result directly. https://support.gitkraken.com/working-wit

I like the merge tool i Gitkraken, it makes it easy to choose one side for each conflict or edit the result directly. https://support.gitkraken.com/working-with-repositories/branching-and-merging https://support.gitkraken.com/working-with-repositories/bran...