I have used GitHub with a couple of my projects in LabVIEW NXG and it seems to work correctly (I did not use any diff and merge tool). I use SourceTree as the desktop app and follow the recommendations in: Getting Started with GitHub and LabVIEW by NI Systems Engineering.