4 ms·
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 http
by timdorr 15y ago
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
- albertzeyer 15y agoNo, 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.
- uxp 15y agoHere's the original repo with Fabien Sanglard's patch applied on top of it. https://github.com/uxp/doom3.gpl 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.