Problem whith git pull

[Valcars]

Hi I hope I have posted in the right section .... as the title suggests there were about fifteen days that I did not update the server .... it never gave me problems but now when I use git pull it gives me this error which is attached to the image ...... can someone tell me what caused the error and how I can fix it without deleting the changes ....

[Start_]

You need to commit your changes first because there are conflicted files with latest rAthena updates.

Did you forked from rAthena yet or just using their reposity?

[Valcars]

hello I copied rAthena from its repository ...... could you explain to me how to do so as not to have problems in the future .... sorry but unfortunately I'm not very familiar with git ....: \

[Start_]

1.Hit fork on rAthena GitHub sites.

2.You can see your own rAthena on https://github.com/Valcars1992?tab=repositories

3.Then use it instead of official rAthena reposity.

For you changes you can take it out by FTP (FileZilla) or otherway that can take whole folders out. (In case you don't want to lose your changes) then copy paste to your reposity again.

[Valcars]

ah ok thanks I'll try as soon as I get back from work .... thanks for the explanation this afternoon I'll try and let you know ..... thanks again