Updating Rathena Using Git Without Losing My Modifications

[kevinkarl22]

Good Day! Can someone help me on how to update my rathena folder to the latest. I used git clone to get the rathena folder from here https://github.com/rathena/rathena but it keeps updating like every other day it has commits and what I am doing is using git clone again to get the latest rathena then modify my changes again. I keep doing that again and again. Is there an easy way to update my rathena folder without losing the modifications i made on that folder?

 

Thanks in advance!!   

[benching]

fork from rathena/rathena,
then you can clone from the copy you have in your repo.

Edited April 11, 2016 by benching

[Playtester]

Depends on what your changes are. If they don't conflict with the changes done to rAthena, then you can just do: stash save -> pull -> stash pop. Done.

 

Stash save basically saves your modifications into a separate file and removes them from the repository so you can update without any problems. Then pull gets the updates from rAthena. Then stash pop applies your modifications to the source again. Here it will also tell you when there are conflicts.

 

If there are conflicts you need to resolve them yourself by taking a look at the code.

 

So what I do in case of conflicts is... because I know my changes better than I know the changes from others, I keep a copy of my sources before the update and when there is a conflict I always just choose "Solve conflict using theirs" which removes my changes (but only those that are in conflict). Then I take a look at the modifications from me that got removed and think if I even still need them (could be that conflict is just there because rA fixed something I fixed beforehand, then I don't need my modification anymore). If I still need the modification I either just write it again into the new structure or open my old source file and the new version with a diff tool and move the lines I still need over from old to new.

[rmon]

Hi @Playtester

Can you share us guide for those commands please ? Currently using CentOS(CLI)

Thanks.

Edited October 23, 2017 by rmon

[Playtester]

I'm using TortoiseGit so I can just click on the corresponding buttons.