[DiscordArchive] Obviously it isn't?
[DiscordArchive] Obviously it isn't?
Archived author: KalTheDrow • Posted: 2021-03-03T14:23:24.656000+00:00
Original source
so i have to merge 3 things when updating
Archived author: Serithul • Posted: 2021-03-03T14:23:34.155000+00:00
Original source
Oof :\
Archived author: Serithul • Posted: 2021-03-03T14:23:41.115000+00:00
Original source
That gets complicated then
Archived author: ZaDarkSide • Posted: 2021-03-03T14:23:54.292000+00:00
Original source
or here's a stupid idea, clone the 2 repos in 2 folders, get all the files from repo 1 and copy, then paste them on top repo 2, see what files are modified, and either accept the changes or revert them, but seems this is a git issue you are having, because you don't know how to use git to merge properly
Archived author: KalTheDrow • Posted: 2021-03-03T14:24:10.282000+00:00
Original source
I don't expect the tags and heads to match TC
But I'm trying to work out what's deciding the TDB version so I can populate my now currently empty world DB: P
Archived author: Serithul • Posted: 2021-03-03T14:24:58.940000+00:00
Original source
It's both that cmake file and entries in the database
Archived author: ZaDarkSide • Posted: 2021-03-03T14:25:11.257000+00:00
Original source
so it's asking for a old SQL file because you didn't actually merged the new changes in your source properly
Archived author: MaxtorCoder • Posted: 2021-03-03T14:26:07.814000+00:00
Original source
That shouldn't matter tho?
Archived author: Serithul • Posted: 2021-03-03T14:26:38.412000+00:00
Original source
You could do a full src search of the string name of the tdb it asks you for and see where it's defined
Archived author: Serithul • Posted: 2021-03-03T14:27:05.785000+00:00
Original source
And then check commits from TC where they change those places