a year ago i downloaded the latest TC Repository that was avaible back then via Github.
A few weaks later i found out about Eluna and added it to the local Trinitycore.
I made a Mistake back then since i downloaded the Eluna Repository as Rar and added it to the Core i already had.
Everything worked just fine back then.
Over the last months we updated our local Trinitycore and maked changes to the core ( Level, Statscount, Anticheat etc. etc. )
Sadly i did not write a log about the changes i made.
Now i have the problem that i need to update Eluna to the newest Version.
So i tried the 2 ways i found out while searching about it:
1. commiting the changes and pulling the new source
-> An error for each local change, still updates everything, ends in about 50 compiling errors when i try it ( can post them later, i am at work )
2. stashing the changes, pulling the updates, applying the changes
-> Sounds good so far, but since i made a mistake back then the Eluna Folder in \src\ is a Directory and cant be stashed. when i try the parameter to decide which files to stash i get over 8000 messages with "Do you want to stash XY - Y for Yes"
So, since i made a pretty stupid mistake back then, and since im a complete noob in Github i am asking you for help.
How can i update my Trinitycore + Eluna AND keep all local changes i made?
I hope my pretty bad english is in some kind understandable. If you need any more Informations about the topic i can add them later / when im back from work!
Screenshots of the Errors etc will get added when im back at home!