[DiscordArchive] Guys how can i update a patch in trinitycore? more especially the npcbots one? im using a old versio
[DiscordArchive] Guys how can i update a patch in trinitycore? more especially the npcbots one? im using a old versio
Original source
Merging in is fine, but the way he's done it is really weird
rektbyfaith
03-16-2024, 05:59 PM #31Archived author: Foe • Posted: 2024-03-16T17:59:03.946000+00:00
Original source
Merging in is fine, but the way he's done it is really weird
Original source
No it's not
rektbyfaith
03-16-2024, 06:00 PM #32Archived author: chipzz • Posted: 2024-03-16T18:00:15.183000+00:00
Original source
No it's not
Original source
Merging is fine if you merge back into the main repo and that's it
rektbyfaith
03-16-2024, 06:00 PM #33Archived author: chipzz • Posted: 2024-03-16T18:00:32.642000+00:00
Original source
Merging is fine if you merge back into the main repo and that's it
Original source
But if you want to maintain a patch indefinitely, merging is a dumb thing to do
rektbyfaith
03-16-2024, 06:00 PM #34Archived author: chipzz • Posted: 2024-03-16T18:00:50.226000+00:00
Original source
But if you want to maintain a patch indefinitely, merging is a dumb thing to do
Original source
Yes it is? We merge in every day, but we don't merge in from our own separate branch, but from the parent repo
rektbyfaith
03-16-2024, 06:00 PM #35Archived author: Foe • Posted: 2024-03-16T18:00:57.391000+00:00
Original source
Yes it is? We merge in every day, but we don't merge in from our own separate branch, but from the parent repo
Original source
Im giga lost
rektbyfaith
03-16-2024, 06:01 PM #36Archived author: Infectious • Posted: 2024-03-16T18:01:24.782000+00:00
Original source
Im giga lost
Original source
Yeah and that also means you make it incredibly hard to figure out what exactly the parts are that you modified
rektbyfaith
03-16-2024, 06:01 PM #37Archived author: chipzz • Posted: 2024-03-16T18:01:30.364000+00:00
Original source
Yeah and that also means you make it incredibly hard to figure out what exactly the parts are that you modified
Original source
Not at all
rektbyfaith
03-16-2024, 06:01 PM #38Archived author: Foe • Posted: 2024-03-16T18:01:36.465000+00:00
Original source
Not at all
Original source
It's extremely easy
rektbyfaith
03-16-2024, 06:01 PM #39Archived author: Foe • Posted: 2024-03-16T18:01:40.927000+00:00
Original source
It's extremely easy
Original source
I mean, you could do a git diff against upstream master, but then you collapse all your commits into one diff
rektbyfaith
03-16-2024, 06:01 PM #40Archived author: chipzz • Posted: 2024-03-16T18:01:49.691000+00:00
Original source
I mean, you could do a git diff against upstream master, but then you collapse all your commits into one diff
1 Guest(s)
1 Guest(s)