Git commands

[Tales]

Hellow!

Now i'm starting a "Oficial-Based" server with git commands...
 

i'm using

git clone https://github.com/rathena/rathena.git ~/rathena

to download the latest git from rathena... my doubt is:

1 - When someone update the master-branch, how can i update my git?

2 - If i make some changes in my source, i'll lost'em when update?
 

[Lord Ganja]

- You can use stash save to save the changes

- Then git pull to update

- Stash pop to put the changes back

Edited September 4, 2015 by Lord Ganja

[shadowscreen]

You can also create a new branch with  "git branch <branchname>" where you apply your changes and everytime you "git pull" the master branch simply merge the changes into you

server branch.

 

The good thing is that you can setup a test branch before you apply the changes to your server.

[Tales]

Can you show the commands?

[shadowscreen]

if you really want to start working with git, you should read yourself into it.

Otherwise it may happen that you mess up at some point if you dont know how to deal with certain commands properly.

 

https://git-scm.com/book/en/v2/Getting-Started-Git-Basics