How to solve Git differences¶ https://developer.atlassian.com/blog/2015/12/tips-tools-to-solve-git-conflicts/