database was replace on update

[Akiraro]

hi there good day , i am just wondering .. how to recover my old files "except for the backup ofcourse" ... because all of my npc mods, + source files hasbeen replace with the new rathena files after i update my trunk to the latest hash . please help thank you

[Haziel]

As far as I know, on Git's end, after agreeing on rerplacing the files, there's no way to revert, but I may be wrong.
If the modifications were made, of course, on default files.

Edited January 9, 2018 by Haziel

[Akkarin]

If you followed the guides on how to update your local repo you would be able to recover them. 

[Akiraro]

thank you haziel , looks like i will start again

[Akiraro]

well i was just using "git stash save" "git pull" "git stash pop" after that .. my server side has been wiped out to a clean rathena folder

[Akkarin]

That means the pop command didn't return your files, possibly due to a conflict. It's generally best practise to commit your local changes and pull from remote "github.com/rathena/rathena" so your changes are correctly merged. Stashing is only effective if you're making minimal edits and making full use of the import directories.

[Akiraro]

aight! thnx though .. learned my mistake .. it seems that i have to create backup before.. updating it again to a newer hash