Hacker News Reader

Comment by timdorr | Hacker News Reader

They can easily merge those changes. You just have to use the git command line. It's possible to merge in a separate repo. Like so:

  git remote add d3mac https://github.com/fabiensanglard/Doom3-for-MacOSX-.git
  git fetch d3mac
  git merge d3mac/master

View on HN

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.

Reply on news.ycombinator.com