[DiscordArchive] honestly if i can just remove both of them and start over I don't mind doing that, does the git reve
[DiscordArchive] honestly if i can just remove both of them and start over I don't mind doing that, does the git reve
Archived author: Sanctuary • Posted: 2022-01-29T01:34:13.187000+00:00
Original source
i did the direct merge technique the first time
Archived author: Sanctuary • Posted: 2022-01-29T01:34:23.714000+00:00
Original source
maybe i should do the diff way this time?
![[Image: unknown.png?ex=690ca475&is=690b52f5&hm=6...583e92e58&]](https://cdn.discordapp.com/attachments/415944535718494208/936797014170161262/unknown.png?ex=690ca475&is=690b52f5&hm=6750454cd4e7ce503a607917bdd3248237c4ac1462f29ca9c816def583e92e58&)
Archived author: Sanctuary • Posted: 2022-01-29T01:36:54.084000+00:00
Original source
![[Image: unknown.png?ex=690ca475&is=690b52f5&hm=6...583e92e58&]](https://cdn.discordapp.com/attachments/415944535718494208/936797014170161262/unknown.png?ex=690ca475&is=690b52f5&hm=6750454cd4e7ce503a607917bdd3248237c4ac1462f29ca9c816def583e92e58&)
Archived author: Sanctuary • Posted: 2022-01-29T01:39:30.417000+00:00
Original source
https://tenor.com/view/shrug-idk-dexter-...f-10412116
![[Image: unknown.png?ex=690ca55b&is=690b53db&hm=4...6951bb3af&]](https://cdn.discordapp.com/attachments/415944535718494208/936797979698946048/unknown.png?ex=690ca55b&is=690b53db&hm=4fde1f46ecaadbd75e957e106370817b456a8e6b87d0f3f3ac16c196951bb3af&)
Archived author: Sanctuary • Posted: 2022-01-29T01:40:43.410000+00:00
Original source
maybe this is it?
![[Image: unknown.png?ex=690ca55b&is=690b53db&hm=4...6951bb3af&]](https://cdn.discordapp.com/attachments/415944535718494208/936797979698946048/unknown.png?ex=690ca55b&is=690b53db&hm=4fde1f46ecaadbd75e957e106370817b456a8e6b87d0f3f3ac16c196951bb3af&)
Archived author: Sanctuary • Posted: 2022-01-29T01:45:53.276000+00:00
Original source
well since i ran the it the diff way it says there were changes made in the git bash window so i'm going to cmake and compile, maybe something changed, i'll let you all know if it works ♂️
Archived author: Sanctuary • Posted: 2022-01-29T01:47:31.876000+00:00
Original source
I swear i just need to delete the first one somehow and i bet it would work
Archived author: Demonic • Posted: 2022-01-29T06:23:26.936000+00:00
Original source
Worked like a charm, I now have all the skills I need properly displaying in the spellbook