Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

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.


Here's the original repo with Fabien Sanglard's patch applied on top of it.

https://github.com/uxp/doom3.gpl

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.




Consider applying for YC's Winter 2026 batch! Applications are open till Nov 10

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: