terakoth Posted May 12, 2017 Report Share Posted May 12, 2017 If there is a pull request that I would like to add to my server is there an easy way to do this or add the correct information in by using a command or something simple or do I have to add everything one by one manual Link to comment Share on other sites More sharing options...
codeman3518 Posted May 13, 2017 Report Share Posted May 13, 2017 As far as I know you have to do it all manual unless I have been doing this work for nothing but anything good you have to do a lot of work to get something great out of it. Just like what you want out of life you only get what you put into life what you get back. Though I do have an application I made that makes this process a lot smoother which takes each file and changes what is in the core over a smooth transition to the commit or request. I will send you the application. 1 Link to comment Share on other sites More sharing options...
Rochet2 Posted May 13, 2017 Report Share Posted May 13, 2017 If you dont mind updating your core in the process with the fork's TC version that the pull request is made for then you can just do git pull <the fork address> <branch name> If you only want the pull request contents, then you can download it as a diff by appending ".diff" to the end of the pull request URL in github. Same for patch.https://github.com/TrinityCore/TrinityCore/pull/19297https://github.com/TrinityCore/TrinityCore/pull/19297.diffhttps://github.com/TrinityCore/TrinityCore/pull/19297.patch The patch would be the same as doing a cherry-pick in a way I guess if you apply it with git am < file.patch There are many other ways to go about doing this. For example you could make a cherry-pick of the commits that are pull requested. (fetch the pull request repository and then do a cherry-pick firstCommitHash^...LastCommitHash) It seems you can also try reference the pull request repository through TC repository as seen here:https://help.github.com/articles/checking-out-pull-requests-locally/ git fetch origin pull/PRID/head:BRANCHNAME origin is assumed to be trinitycore repository. Link to comment Share on other sites More sharing options...
jackpoz Posted May 15, 2017 Report Share Posted May 15, 2017 You can also add the remote repo where the pull request is and then merge it into the local TC branch (3.3.5 or master). It will be up to you to deal with merge conflicts and updates tho (probably requiring to rebase from time to time). Link to comment Share on other sites More sharing options...
Recommended Posts