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.