Using Git(Hu/La)b

[Смердокрыл 191]

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

[wungasaurus 120]

`git pull`

`git stash; git pull; git stash pop`

You should probably fork, do commits and merge though. 

[Смердокрыл 191]

Just now, wungasaurus said:

You should probably fork, do commits and merge though. 

 

*Rolls eyes*

*Saliva dripping on the floor*

*Unintelligible noises*

[wungasaurus 120]

How did you clone in the first place?

[Смердокрыл 191]

11 minutes ago, wungasaurus said:

How did you clone in the first place?

Rmb -> GitExt Clone... > *insert details* > Clone

[Смердокрыл 191]

55 minutes ago, wungasaurus said:

`git pull`

 

51 minutes ago, Смердокрыл said:

*Rolls eyes*

*Saliva dripping on the floor*

*Unintelligible noises*

 

 

[Смердокрыл 191]

On 10.06.2017 at 9:48 PM, Смердокрыл said:

 

Could someone please explain how this works?

[wungasaurus 120]

17 minutes ago, Смердокрыл said:

Could someone please explain how this works?

Click "pull".

[Смердокрыл 191]

8 minutes ago, wungasaurus said:

Click "pull".

I mean, which merge options should I use to get the desired result?

[wungasaurus 120]

Likely, the defaults are already fine. What _is_ your desired result?

[Смердокрыл 191]

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?

 

 

[wungasaurus 120]

Click "pull".

[barncastle 52]

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.