[DiscordArchive] what if you use git pull --all, does it mention upstream at all?
[DiscordArchive] what if you use git pull --all, does it mention upstream at all?
Archived author: Revision • Posted: 2023-02-09T20:58:11.973000+00:00
Original source
I mean compared to merging AC into npcbots
Archived author: Roddan • Posted: 2023-02-09T20:58:41.612000+00:00
Original source
Yeah I tried that with NPCBots Patch but it had some warnings/errors
Archived author: Rymercyble • Posted: 2023-02-09T20:58:49.333000+00:00
Original source
it doesnt matter after u combine them they are same result and next update can result in conflict no matter what
Archived author: matrix1999 • Posted: 2023-02-09T20:59:51.474000+00:00
Original source
exactly
Archived author: Roddan • Posted: 2023-02-09T20:59:55.077000+00:00
Original source
True
Archived author: Rymercyble • Posted: 2023-02-09T21:00:46.798000+00:00
Original source
in bigger picture i would advice to either not update it and rely on updates of that specific repo or learn some git and programming so u are able to fix it if there is conflict
Archived author: Revision • Posted: 2023-02-09T21:00:51.010000+00:00
Original source
I believe those you showed are warnings, not errors
![[Image: image.png?ex=690c63c7&is=690b1247&hm=28e...bb6a84867&]](https://cdn.discordapp.com/attachments/284406375495368704/1073347791402844252/image.png?ex=690c63c7&is=690b1247&hm=28e03fdbea5013528d7cd93b0bc12f67b57539bac8dfdb43624a1eabb6a84867&)
Archived author: Revision • Posted: 2023-02-09T21:00:55.362000+00:00
Original source
![[Image: image.png?ex=690c63c7&is=690b1247&hm=28e...bb6a84867&]](https://cdn.discordapp.com/attachments/284406375495368704/1073347791402844252/image.png?ex=690c63c7&is=690b1247&hm=28e03fdbea5013528d7cd93b0bc12f67b57539bac8dfdb43624a1eabb6a84867&)
Archived author: Roddan • Posted: 2023-02-09T21:01:34.561000+00:00
Original source
Yeah those ye
Archived author: Revision • Posted: 2023-02-09T21:01:44.280000+00:00
Original source
I applied the patch and it added the npcbots AI. I'm not going to check every changed file but you should try compiling after applying the patch to see if it'll error that way