[DiscordArchive] trying to apply it to what ? clean 335 or custom branch ?
[DiscordArchive] trying to apply it to what ? clean 335 or custom branch ?
Original source
trying to apply it to what ? clean 335 or custom branch ?
rektbyfaith
08-06-2024, 04:24 PM #1Archived author: jackpoz • Posted: 2024-08-06T16:24:46.389000+00:00
Original source
trying to apply it to what ? clean 335 or custom branch ?
Original source
I cloned clean TC applied eluna, npcbots and learnspells on lvl up
rektbyfaith
08-06-2024, 04:25 PM #2Archived author: Rafael • Posted: 2024-08-06T16:25:43.243000+00:00
Original source
I cloned clean TC applied eluna, npcbots and learnspells on lvl up
Original source
and i tried using diff
rektbyfaith
08-06-2024, 04:26 PM #3Archived author: Rafael • Posted: 2024-08-06T16:26:10.795000+00:00
Original source
and i tried using diff
Original source
It gave some errors and I fixed them manually
rektbyfaith
08-06-2024, 04:26 PM #4Archived author: Rafael • Posted: 2024-08-06T16:26:22.445000+00:00
Original source
It gave some errors and I fixed them manually
Original source
so you manually fixed merged conflicts ?
rektbyfaith
08-06-2024, 04:28 PM #5Archived author: jackpoz • Posted: 2024-08-06T16:28:05.037000+00:00
Original source
so you manually fixed merged conflicts ?
Original source
those errors probably mean the way you solved those conflicts was not done correctly
rektbyfaith
08-06-2024, 04:28 PM #6Archived author: jackpoz • Posted: 2024-08-06T16:28:30.689000+00:00
Original source
those errors probably mean the way you solved those conflicts was not done correctly
Original source
did you use git to solve the merge conflicts ? Player.h probably had some
rektbyfaith
08-06-2024, 04:29 PM #7Archived author: jackpoz • Posted: 2024-08-06T16:29:30.538000+00:00
Original source
did you use git to solve the merge conflicts ? Player.h probably had some
Original source
I didnt use git i ll try with git this time
rektbyfaith
08-06-2024, 05:02 PM #8Archived author: Rafael • Posted: 2024-08-06T17:02:31.304000+00:00
Original source
I didnt use git i ll try with git this time
Original source
There should be a diff file you can just apply
rektbyfaith
08-06-2024, 05:02 PM #9Archived author: Barais • Posted: 2024-08-06T17:02:44.668000+00:00
Original source
There should be a diff file you can just apply
Original source
It doesnt apply with my custom changes :C
rektbyfaith
08-06-2024, 05:03 PM #10Archived author: Rafael • Posted: 2024-08-06T17:03:04.631000+00:00
Original source
It doesnt apply with my custom changes :C
1 Guest(s)
1 Guest(s)