Resolve merge conflicts smartly with GUI

Code snippet is taken from https://github.com/golang/example
The Magic Window
Code snippet taken from https://github.com/golang/example

--

--

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store