[DiscordArchive] And also was it or was it not merged prematurely?
[DiscordArchive] And also was it or was it not merged prematurely?
Archived author: Bench • Posted: 2023-09-28T15:01:15.544000+00:00
Original source
And of course correct conflicts if/when they come up
Archived author: Foe • Posted: 2023-09-28T15:01:19.719000+00:00
Original source
Whether or not someone wants to undertake that work is a different topic altogether
Archived author: Foe • Posted: 2023-09-28T15:01:36.321000+00:00
Original source
Conflicts are definitely going to arise
Archived author: Foe • Posted: 2023-09-28T15:02:00.510000+00:00
Original source
But it's easier to handle a weeks worth of conflicts instead of a month, half a year, a year worth of conflicts
Archived author: Nyeriah • Posted: 2023-09-28T15:02:07.424000+00:00
Original source
Honestly I think qaston isn’t a top priority for us at this time
![[Image: image.png?ex=690c0fb5&is=690abe35&hm=2b4...3fe1fd67d&]](https://cdn.discordapp.com/attachments/284406375495368704/1156969117811757076/image.png?ex=690c0fb5&is=690abe35&hm=2b4942f98d5def027db60edec1d91256bbb2abd7b95f85f2c3c387b3fe1fd67d&)
Archived author: Rymercyble • Posted: 2023-09-28T15:02:13.195000+00:00
Original source
only few conflicts
![[Image: image.png?ex=690c0fb5&is=690abe35&hm=2b4...3fe1fd67d&]](https://cdn.discordapp.com/attachments/284406375495368704/1156969117811757076/image.png?ex=690c0fb5&is=690abe35&hm=2b4942f98d5def027db60edec1d91256bbb2abd7b95f85f2c3c387b3fe1fd67d&)
Archived author: Foe • Posted: 2023-09-28T15:02:44.622000+00:00
Original source
Could be a lot, could be little
Archived author: Bench • Posted: 2023-09-28T15:02:48.641000+00:00
Original source
Got knocked off the pin on the issue page after all
Archived author: Foe • Posted: 2023-09-28T15:02:50.029000+00:00
Original source
Depends on the conflicts per file
Archived author: Rymercyble • Posted: 2023-09-28T15:03:02.312000+00:00
Original source
its somewhere between 50-100 conflicts