db/re latest updated error

[Qura]

It's been awhile (2-3 weeks) not updating .git rathena server. Suddenly after updating the .git file, I'm experiencing this issues.

Came from db/re/item_db.txt and db/re/item_combo_db.txt.

 

and

 

First and foremost, will someone please enlighten me?

Actually, 

 

1. Is it by updating the .git file (right click>SVN Update) is the appropriate way to update the git? Or is there any other proper way (specific update revision, etc)?

2. If this issue happens, is there any other way to reverse/recover the previous working .git?

3. How to solve this issue? Hehe

 

Apologies me, I'm still in the beginning of learning.

Thank you for everyone guidance support for all this while. 

[Secrets]

Update your source code and recompile your server.

I've minified some item scripts by replacing ternary operators with min/max calls which are new script commands implemented recently.

[Technoken]

Do you still have the backup?

 

right click > tortoise git > stash save // this will save your modifications

right click > tortoise git > pull            // this will update your git to the latest revision

right click > tortoise git > stash pop  // this will apply the modifications your saved

 

sometimes you will encounter conflicts after using stash pop because of the modifications but I used to fix them manually.

[Qura]

Do you still have the backup?

 

right click > tortoise git > stash save // this will save your modifications

right click > tortoise git > pull            // this will update your git to the latest revision

right click > tortoise git > stash pop  // this will apply the modifications your saved

 

sometimes you will encounter conflicts after using stash pop because of the modifications but I used to fix them manually.

Thank you Technoken for enlightening me! I will try it.

 

 

Update your source code and recompile your server.

I've minified some item scripts by replacing ternary operators with min/max calls which are new script commands implemented recently.

Thank you secretdataz, it's worked after I recompiled it. Thank you for the guidance!