[SOLVED] how to update the source without affecting the modified files?

[DndTheTroll]

Hello, as you see that topic is clear from it's title I want to update my core but without affecting/replacing my modified files can someone tell me how?


+rep

 

[Tommy]

You can do a pull, then merge and edit out the difference. Your edits would have to be saved in a commit though.

 

[DndTheTroll]

Didn't get it

 

[Hyperion]

Didn't get it

What did you not get?

 

[Tommy]

Didn't get it

What do you use TortoiseGIT or Git Bash?

 

[DndTheTroll]

What do you use TortoiseGIT or Git Bash?

i've both

 

[AlexeWarr]

Mido I suggest you compile a new source.. that old one wont work with the updates..

 

[DndTheTroll]

Mido I suggest you compile a new source.. that old one wont work with the updates..

i used eluna one

https://github.com/ElunaLuaEngine/Source

 

[Rochet2]

You could for example try using:
git add .
git diff head >> mychanges.diff
to save your changes just incase something goes wrong.
Also take up the commit you are on at the moment for example from the server startup or .server info or with git log command in git.

Then try pulling again. so git pull
Use the SQL files generated to the update folders to your DB (only the new SQLs, see created date for example)
recompile, fix compile errors.

 

[Hyperion]

~marking solved