[DiscordArchive] nice, says clean tree now, i should do git status and make sure it always says clean tree before sta
[DiscordArchive] nice, says clean tree now, i should do git status and make sure it always says clean tree before sta
Original source
nice, says clean tree now, i should do git status and make sure it always says clean tree before starting a new process i assume?
rektbyfaith
09-19-2021, 02:31 PM #1Archived author: Sanctuary • Posted: 2021-09-19T14:31:00.669000+00:00
Original source
nice, says clean tree now, i should do git status and make sure it always says clean tree before starting a new process i assume?
Original source
![[Image: unknown.png?ex=690c08a4&is=690ab724&hm=5...5e775c2a7&]](https://cdn.discordapp.com/attachments/870722120458600528/889156900267102278/unknown.png?ex=690c08a4&is=690ab724&hm=5dc8108d72f5afbf461c7715b023c8999d46dd427c01148524e5e785e775c2a7&)
rektbyfaith
09-19-2021, 02:32 PM #2Archived author: Sanctuary • Posted: 2021-09-19T14:32:05.364000+00:00
Original source
Original source
wait i know this one, i remove the uh >>>>> and <<<<<< and ===== then save it and then try the cmake and build right?
rektbyfaith
09-19-2021, 02:33 PM #3Archived author: Sanctuary • Posted: 2021-09-19T14:33:54.808000+00:00
Original source
wait i know this one, i remove the uh >>>>> and <<<<<< and ===== then save it and then try the cmake and build right?
Original source
![[Image: unknown.png?ex=690c0941&is=690ab7c1&hm=b...7af440f03&]](https://cdn.discordapp.com/attachments/870722120458600528/889157558424727552/unknown.png?ex=690c0941&is=690ab7c1&hm=bfc93f95b5234ae0e6e56f8509c52ff324bd554b2a6b0bbc0f668b17af440f03&)
rektbyfaith
09-19-2021, 02:34 PM #4Archived author: Sanctuary • Posted: 2021-09-19T14:34:42.483000+00:00
Original source
Original source
oh i should delete this stuff now right?
![[Image: unknown.png?ex=690c096f&is=690ab7ef&hm=c...aaedaef97&]](https://cdn.discordapp.com/attachments/870722120458600528/889157749307473930/unknown.png?ex=690c096f&is=690ab7ef&hm=cb3e97e9d502b6d25e4c88a3464e23bb0a58bbcfe4fd1858cd2d1fdaaedaef97&)
rektbyfaith
09-19-2021, 02:35 PM #5Archived author: Sanctuary • Posted: 2021-09-19T14:35:28.447000+00:00
Original source
oh i should delete this stuff now right?
Original source
the `>>>>>` stuff means there was a merge conflict, i.e. changes happening in both your existing branch and the one you merged, meaning you need to look closely at what the program is _supposed_ to do where that happens because git couldn't figure which of the lines should be used automatically.
rektbyfaith
09-19-2021, 02:40 PM #6Archived author: <o> • Posted: 2021-09-19T14:40:17.651000+00:00
Original source
the `>>>>>` stuff means there was a merge conflict, i.e. changes happening in both your existing branch and the one you merged, meaning you need to look closely at what the program is _supposed_ to do where that happens because git couldn't figure which of the lines should be used automatically.
Original source
you should not remove the `AddSC_*` calls, that's how those systems are initialized on the server.
rektbyfaith
09-19-2021, 02:41 PM #7Archived author: <o> • Posted: 2021-09-19T14:41:09.779000+00:00
Original source
you should not remove the `AddSC_*` calls, that's how those systems are initialized on the server.
Original source
azerothcore has some weird thing about automatically updating that file, but in trinitycore it's a normal code file and you need to keep the stuff that's in it
rektbyfaith
09-19-2021, 02:42 PM #8Archived author: <o> • Posted: 2021-09-19T14:42:07.505000+00:00
Original source
azerothcore has some weird thing about automatically updating that file, but in trinitycore it's a normal code file and you need to keep the stuff that's in it
Original source
ok so if i Build, it should show me where the errors are at and the file locations right?
rektbyfaith
09-19-2021, 02:43 PM #9Archived author: Sanctuary • Posted: 2021-09-19T14:43:21.049000+00:00
Original source
ok so if i Build, it should show me where the errors are at and the file locations right?
Original source
correct
rektbyfaith
09-19-2021, 02:43 PM #10Archived author: <o> • Posted: 2021-09-19T14:43:28.511000+00:00
Original source
correct
1 Guest(s)
1 Guest(s)