Leaderboard

Hi, i just want to share this translated script of Sara's Memory instance. I got it from idathena, they just added it few days ago. hehe. i hope someone will share their instance script for charleston and horror toy factory too, including mobs.. hehe SarasMemory.7z

I really don't know what happened but it seems I get through. What I did is I use stash save then git clean up then git pull then stash pop. and it goes well I was looking the log, when rA was using SVN, there's msg log on github commit which SVN rev it's merged, and when rA started use Github, since 17704 there's git hash on SVN log. first, after u done merge u're custom, make the diff first git diff HEAD > mycustom.diff then, u can try git stash && git pull && git stash pop PS: - I never update using command line, I always use UI/3rd party (SmartGit) - When got stuck if using command while updating because "file xxx need to be merged", use "git add --force <filepath>", OR u can reset the local by using "git reset HEAD && git stash && git pull", but after this u need to re-apply ur 'mycustom.diff' using "patch -p1 < mycustom.diff" or add it manually, since u'll meet many conflicted files. Thanks Cydh! I can now use it

this is already been fixed here: https://github.com/rathena/rathena i suggest to use GIT instead of SVN or wait for this fixed to sync into SVN