Pulling fixes issue

[Drakos]

Hey all,

I've downloaded the cores from TC, master and 3.3.5. However, once I extract them to Desktop and try to right click, Git extensions, Pull I'm getting "the current directory is not a valid git repository".

They are fresh cores that are just downloaded. Their exact names are TrinityCore 3.3.5 and TrinityCore-master.

[Rochet2]

You probably downloaded them as zip files instead of using git to download it (clone)
The installation guide tells you what you should do.

https://trinitycore.atlassian.net/wiki/display/tc/Windows+Core+Installation

[Drakos]

Hey,

Yes I downloaded them as zip's, if i use that then I shouldn't be getting such error in the future?

[Drakos]

Also, after I pull fixes, will the changes I've already made to the core/database be lost? If so, is there a way for that not to happen?

[CDawg]

Create patches/diffs for your changes.

After I make a change, I create a patch. before updating your core from TC

git format-patch -1 <commit sha>

After updating your core from TC, then just

git apply <mychanges.patch>

 

If you know the exact changes in a file, you can create the diff. and use the same command to apply that diff as a patch. Git knows.

diff --git a/file1 b/file2

 

TIP:

I find it easier to just use the git patch method for all your changes. Try to create small changes and patches for each of those minor changes. Rather than one large patch that has ALL your changes. It could cause an issue later, then you have to hunt down where it broke because of the conflicts with TC core's changes versus your own changes.

I have like 15 different patches for my personal changes on my own project and If I were to stash all the changes in one file, it would be a nightmare.