Merge tools for git (untested)
A colleague needed help to find merge tools for ios. I run linux, but here is a list of pages of interest for me and for her:
https://stackoverflow.com/questions/12956509/how-to-set-meld-as-git-mergetool/33955194
https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git