Jump to content
  • 0

Stone curse wont break after death


Question

5 answers to this question

Recommended Posts

  • 0
Posted
7 hours ago, Start_ said:

Use 'git pull' command.

Or if you using Github Desktop just hit fetch and pull on rAthena reposity.

 

It wont affect my files in conf, src and npc? I already made some changes. The last time I git pull, all files were replaced by new ones.

  • 0
Posted (edited)

@funtwocrasher

I strongly recommend that you set up your server in a way you can always update rAthena without merging trouble. That way you can always stay up-to-date on all the fixes without much effort.

For conf/db changes, you only need to make sure to use the import folder for your changes instead of the files themselves. Those folders are set to be ignored by git so your changes are safe there.

SRC/NPC changes are part of the git repository, it's a bit more tricky there, it depends a little bit on how you apply your customization. If you are like me and just edit the files directly, but not check them in at all, not even locally (kinda risky), then you need to call "Stash changes" (I'm using Tortoise Git) first, this will remove all your custom changes temporarily and put them into a stash. Then you can just call "Pull" which will update your base files to the latest rAthena (assuming you are still on the master branch). Afterwards just call "Stash pop" that puts your custom changes back in. Sometimes if you changed something that was also updated on rAthena you will have to do a merge and decide what changes to keep / adjust.

If you commit your changes into your local respository then as far as I know you can just call Pull directly and it will automatically merge it. If you have your own branch you need to select yourself that you want to merge master into your branch. Not too familiar with that process though.

If are really scared of losing your changes, you could also just copy your whole rathena folder as a backup before you pull. Then you can restore lost changes by moving files from the backup back into the main folder. Or to keep a better overview, just backup the files you actually changed.

Hope this helps.

Edited by Playtester

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Answer this question...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

  • Recently Browsing   0 members

    • No registered users viewing this page.
×
×
  • Create New...