2012-05-17, 12:35
(2012-05-17, 11:47)Jesman Wrote: I would like to help with the merge, but I'm not familiar with Git also I think I miss the right tools.
When someone could provide a little demo or tutorial on "how to do a merge" it would be really great.
And yes I know that a merge is and I understand the language but I'm a native x++ developer and work normally with a total different enviroment.
Had the same problem. For me this article got me started http://wiki.xbmc.org/index.php?title=HOW...or_Windows . Once you have that all setup with the source of your choice on github you can just right-click a root folder (xbmc) and used TortoiseGit to do a "review patch" what gives you the option to insert the patch to the source. After that you can build the complete installer as described in the article.
After debugging building a release version and only moving the compiled .exe from the projects folder in your source to your local xbmc installation worked most of the time for me without going through the hassle of building a full installer.
btw. I tried at first with the VisualStudio 11 Beta and got lots of compile errors, after installing Visual C++ Express 2010 it all went smooth.