[DiscordArchive] when do you plan to add your commit?
[DiscordArchive] when do you plan to add your commit?
Original source
Not necessary
rektbyfaith
03-14-2022, 07:54 PM #11Archived author: Nefertum • Posted: 2022-03-14T19:54:11.830000+00:00
Original source
Not necessary
Original source
What must I do to view conflicts?
rektbyfaith
03-14-2022, 07:55 PM #12Archived author: Bogir • Posted: 2022-03-14T19:55:01.871000+00:00
Original source
What must I do to view conflicts?
Original source
You can solve merge conflicts via GitHub or your preferred editor on git
rektbyfaith
03-14-2022, 07:55 PM #13Archived author: Nefertum • Posted: 2022-03-14T19:55:35.679000+00:00
Original source
You can solve merge conflicts via GitHub or your preferred editor on git
Original source
![[Image: unknown.png?ex=690c549a&is=690b031a&hm=c...58f9f26cf&]](https://cdn.discordapp.com/attachments/284323424032129024/953018726595321938/unknown.png?ex=690c549a&is=690b031a&hm=cd0d31ad336394f8c042bcc6121b4913796a55b08b9834f76c9841058f9f26cf&)
rektbyfaith
03-14-2022, 07:56 PM #14Archived author: Nefertum • Posted: 2022-03-14T19:56:10.805000+00:00
Original source
Original source
On GitHub clicking on the button "Resolve conflicts"
rektbyfaith
03-14-2022, 07:56 PM #15Archived author: Nefertum • Posted: 2022-03-14T19:56:24.498000+00:00
Original source
On GitHub clicking on the button "Resolve conflicts"
Original source
thanks
rektbyfaith
03-14-2022, 07:58 PM #16Archived author: Bogir • Posted: 2022-03-14T19:58:10.564000+00:00
Original source
thanks
Original source
np
rektbyfaith
03-14-2022, 07:58 PM #17Archived author: Nefertum • Posted: 2022-03-14T19:58:33.478000+00:00
Original source
np
Original source
so, what about implementing `pair` (3068, 0) such as `gossip_train_me` instead `GOSSIP_MENU_THORKAF_DRAGONEYE, GOSSIP_MENU_OPTION_TRAIN` ?
rektbyfaith
03-14-2022, 08:12 PM #18Archived author: Bogir • Posted: 2022-03-14T20:12:14.792000+00:00
Original source
so, what about implementing `pair` (3068, 0) such as `gossip_train_me` instead `GOSSIP_MENU_THORKAF_DRAGONEYE, GOSSIP_MENU_OPTION_TRAIN` ?
Original source
I understood that all of it must be stored in same file. But does wee need such changes (1 pair instead 2 variables)?
rektbyfaith
03-14-2022, 08:13 PM #19Archived author: Bogir • Posted: 2022-03-14T20:13:53.221000+00:00
Original source
I understood that all of it must be stored in same file. But does wee need such changes (1 pair instead 2 variables)?
Original source
That could work too
rektbyfaith
03-14-2022, 08:15 PM #20Archived author: Nefertum • Posted: 2022-03-14T20:15:04.803000+00:00
Original source
That could work too
1 Guest(s)
1 Guest(s)