No, you cannot do that easily the way you described:
$ git fetch d3mac
warning: no common commits
$ git merge d3mac/master
[ many many conflicts ... ]
CONFLICT (add/add): Merge conflict in neo/ui/Winvar.h
Automatic merge failed; fix conflicts and then commit the result.
Just like his concern, I haven't tested building this on windows (VC 2010), so this repo needs to be cleaned up before it should be merged back into the main repo.