Смердокрыл Posted June 10, 2017 Share Posted June 10, 2017 Hey! As most of modding/server software is, thankfully, open source, I've accumulated some questions about using services like GitHub: Let's say I have "cloned" a repository to my computer, and now it has been changed on GitHub. How can I update the one I cloned, instead of deleting it and cloning the whole repository again? Suppose that the repository in the question above is a server (e.g. trinitycore), and after I cloned it, I edited the code to fit my personal needs. How can I do the updating (see the previous question) without overwriting my own edits? I'd be thankful for any help or not Link to comment Share on other sites More sharing options...
wungasaurus Posted June 10, 2017 Share Posted June 10, 2017 `git pull` `git stash; git pull; git stash pop` You should probably fork, do commits and merge though. Link to comment Share on other sites More sharing options...
Смердокрыл Posted June 10, 2017 Author Share Posted June 10, 2017 Just now, wungasaurus said: You should probably fork, do commits and merge though. *Rolls eyes* *Saliva dripping on the floor* *Unintelligible noises* or not Link to comment Share on other sites More sharing options...
wungasaurus Posted June 10, 2017 Share Posted June 10, 2017 How did you clone in the first place? Link to comment Share on other sites More sharing options...
Смердокрыл Posted June 10, 2017 Author Share Posted June 10, 2017 11 minutes ago, wungasaurus said: How did you clone in the first place? Rmb -> GitExt Clone... > *insert details* > Clone or not Link to comment Share on other sites More sharing options...
Смердокрыл Posted June 10, 2017 Author Share Posted June 10, 2017 55 minutes ago, wungasaurus said: `git pull` 51 minutes ago, Смердокрыл said: *Rolls eyes* *Saliva dripping on the floor* *Unintelligible noises* or not Link to comment Share on other sites More sharing options...
Смердокрыл Posted July 20, 2017 Author Share Posted July 20, 2017 On 10.06.2017 at 9:48 PM, Смердокрыл said: Could someone please explain how this works? or not Link to comment Share on other sites More sharing options...
wungasaurus Posted July 20, 2017 Share Posted July 20, 2017 17 minutes ago, Смердокрыл said: Could someone please explain how this works? Click "pull". Link to comment Share on other sites More sharing options...
Смердокрыл Posted July 20, 2017 Author Share Posted July 20, 2017 8 minutes ago, wungasaurus said: Click "pull". I mean, which merge options should I use to get the desired result? or not Link to comment Share on other sites More sharing options...
wungasaurus Posted July 20, 2017 Share Posted July 20, 2017 Likely, the defaults are already fine. What _is_ your desired result? Link to comment Share on other sites More sharing options...
Смердокрыл Posted July 20, 2017 Author Share Posted July 20, 2017 On 10.06.2017 at 8:48 PM, Смердокрыл said: Let's say I have "cloned" a repository to my computer, and now it has been changed on GitHub. How can I update the one I cloned, instead of deleting it and cloning the whole repository again? Suppose that the repository in the question above is a server (e.g. trinitycore), and after I cloned it, I edited the code to fit my personal needs. How can I do the updating (see the previous question) without overwriting my own edits? or not Link to comment Share on other sites More sharing options...
wungasaurus Posted July 20, 2017 Share Posted July 20, 2017 Click "pull". Link to comment Share on other sites More sharing options...
barncastle Posted July 21, 2017 Share Posted July 21, 2017 Just my two cents... If you've never touched Git before it might be worth running through their interactive tutorials as they teach you the commands and a quick overview of how Git works - https://try.github.io/levels/1/challenges/1. Also I'd install the Github Extension for Visual Studio as it hides all the nitty-gritty things behind a simple ui. Link to comment Share on other sites More sharing options...
Using Git(Hu/La)b
By Смердокрылin Miscellaneous
Recommended Posts