akkartik/template-carousel-mobile - Change ULKNZUZKI5PQM36OHZAJHMZVXSEM7UUEOVZPI55B64UBU3UD3REAC

resolve conflicts

Created by akkartik on December 7, 2023

ULKNZUZKI5PQM36OHZAJHMZVXSEM7UUEOVZPI55B64UBU3UD3REAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 16 [8.2]

B:BD[6.9] → [7.9:63]

B:BD[7.63] → [4.11:129]

∅:D[9.121] → [10.11:130]

∅:D[4.129] → [10.11:130]

B:BD[7.169] → [10.11:130]

∅:D[10.130] → [7.240:318]

B:BD[7.240] → [7.240:318]

function App.version_check()
  Mode = 'version_check'
  Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'}  -- put the recommended version first
  local minor_version
  Major_version, minor_version = love.getVersion()
  Version = Major_version..'.'..minor_version
  if array.find(Supported_versions, Version) then
    Mode = 'run'
  end
end

Insertion in main.lua at line 18 [8.2]

[11.2139]

  Supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first
  check_love_version_for_tests()

Deletion in main.lua at line 25 [8.2]
B:BD[12.127] → [13.0:105]
D:D[12.127] → [13.0:105]
BD:BD[12.127] → [13.0:105]
```
  -- Current_app =
  --  | run
  --  | source
  --  | {name=warning message='...' next_app = run|source}
```
Resurrecting zombie bytes in main.lua at line 25 [8.2]
B:B[13.105] → [13.105:106]
D:∅[13.105] → [13.105:106]
BD:B[13.105] → [13.105:106]
Solving an order conflict in main.lua at line 25 [8.2]
[11.2321]
[13.105]
Deletion in main.lua at line 26 [8.2]
B:BD[13.106] → [14.20:73]
BD:BD[13.106] → [14.20:73]
BD:BD[13.106] → [14.20:73]
B:BD[15.30] → [15.30:31]
B:BD[16.186724] → [13.107:146]
BD:BD[16.186724] → [13.107:146]
B:BD[17.186281] → [17.186281:186411]
BD:BD[17.186281] → [17.186281:186411]
B:BD[17.186411] → [14.74:113]
BD:BD[17.186411] → [14.74:113]
∅:D[18.57] → [17.186411:186477]
∅:D[14.113] → [17.186411:186477]
B:BD[17.186411] → [17.186411:186477]
BD:BD[17.186411] → [17.186411:186477]
B:BD[15.31] → [5.20:173]
BD:BD[15.31] → [5.20:173]
```
  if Current_app == nil then
    Current_app = 'run'
  elseif current_app_is_warning() then
  if Current_app == 'run' then
    run.initialize_globals()
  elseif Current_app == 'source' then
    source.initialize_globals()
  elseif current_app_is_warning() then
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
function App.initialize_globals()
  Supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first
  check_love_version_for_tests()
```

Deletion in main.lua at line 30 [8.2]

B:BD[19.414] → [14.114:717]


  -- Another weird bit for a class of corner cases. E.g.:
  -- * I press ctrl+e, switch Current_app. I don't want the new app to receive
  --   text_input and key_release events.
  -- If I try to avoid text_input events by switching modes on key_release, I
  -- hit a new problem:
  -- * I press ctrl+e, am running an untested version, Current_app goes to
  --   'warning', and immediately rolls back out of 'warning' in the
  --   key_release event.
  -- Skip_rest_of_key_events is ugly, but feels cleaner than creating yet
  -- another possible value for Current_app.
  Skip_rest_of_key_events = nil

Deletion in main.lua at line 31 [8.2]
B:BD[20.1052] → [11.2322:2350]
BD:BD[20.1052] → [11.2322:2350]
```
-- called only for real run
```
Insertion in main.lua at line 39 [8.2]
[22.1016]
[16.187114]
```
-- called only for real run
```
Deletion in main.lua at line 48 [8.2]
B:BD[11.2567] → [23.12:12]
B:BD[16.187263] → [13.283:322]
BD:BD[16.187263] → [13.283:322]
```
  elseif current_app_is_warning() then
```
Solving an order conflict in main.lua at line 48 [8.2]
[11.2567]
[16.187263]
Deletion in main.lua at line 51 [8.2]
B:BD[16.187329] → [21.673:697]
BD:BD[16.187329] → [21.673:697]
```
  check_love_version()
```
Deletion in main.lua at line 78 [8.2]
B:BD[11.3078] → [24.11:11]
B:BD[17.187493] → [14.1030:1076]
BD:BD[17.187493] → [14.1030:1076]
```
  if current_app_is_warning() then return end
```
Solving an order conflict in main.lua at line 78 [8.2]
[11.3078]

Insertion in main.lua at line 78 [8.2]

[0.166]

[25.1113]

  end
  check_love_version()
end
function check_love_version()
  if array.find(Supported_versions, Version) == nil then
    Mode = 'version_check'
    -- continue initializing everything; hopefully we won't have errors during initialization

Replacement in main.lua at line 184 [8.2]

B:BD[7.473] → [7.473:664]

    love.graphics.printf(("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, Supported_versions[1]), 40,40, 400)

[7.473]

[7.664]

    love.graphics.printf(("This app hasn't been tested with LÖVE version %s; please switch to version %s if you run into issues. Press any key to continue."):format(Version, Supported_versions[1]), 40,40, 400)

Deletion in main.lua at line 188 [8.2]
B:BD[11.6071] → [23.20:20]
B:BD[18.198] → [14.1077:1116]
BD:BD[18.198] → [14.1077:1116]
BD:BD[18.198] → [14.1077:1116]
B:BD[26.690] → [14.1117:1175]
BD:BD[26.690] → [14.1117:1175]
BD:BD[26.690] → [14.1117:1175]
B:BD[17.187951] → [14.1177:1177]
BD:BD[17.187951] → [14.1177:1177]
```
  elseif current_app_is_warning() then
    love.graphics.printf(Current_app.message, 40,40, 600)
```
Solving an order conflict in main.lua at line 188 [8.2]
[11.6071]
[8.416]
Deletion in main.lua at line 193 [8.2]
B:BD[27.521] → [13.762:808]
```
  if current_app_is_warning() then return end
```
Deletion in main.lua at line 252 [8.2]
B:BD[28.67] → [23.24:24]
B:BD[16.188858] → [21.1317:1349]
BD:BD[16.188858] → [21.1317:1349]
BD:BD[16.188858] → [21.1317:1349]
B:BD[21.1349] → [13.809:844]
BD:BD[21.1349] → [13.809:844]
BD:BD[21.1349] → [13.809:844]
B:BD[15.1154] → [21.1350:1359]
BD:BD[15.1154] → [21.1350:1359]
B:BD[21.1359] → [13.845:867]
BD:BD[21.1359] → [13.845:867]
∅:D[13.867] → [21.1409:1446]
B:BD[21.1409] → [21.1409:1446]
BD:BD[21.1409] → [21.1409:1446]
B:BD[16.189585] → [21.1447:1482]
BD:BD[16.189585] → [21.1447:1482]
```
  Skip_rest_of_key_events = nil
  if current_app_is_warning() then
    else
      clear_warning()
      Skip_rest_of_key_events = true
    Skip_rest_of_key_events = true
```
Solving an order conflict in main.lua at line 252 [8.2]
[28.67]
[29.223]
Deletion in main.lua at line 256 [8.2]
B:BD[7.1049] → [10.136:136]
B:BD[30.1512] → [14.1178:1224]
```
  if current_app_is_warning() then return end
```
Solving an order conflict in main.lua at line 256 [8.2]
[7.1049]
[26.780]
Deletion in main.lua at line 262 [8.2]
B:BD[16.189951] → [21.1483:1528]
BD:BD[16.189951] → [21.1483:1528]
```
  if Skip_rest_of_key_events then return end
```
Solving an order conflict in main.lua at line 262 [8.2]
[28.112]
[31.3116]
Deletion in main.lua at line 269 [8.2]
B:BD[7.1118] → [10.138:138]
B:BD[32.57] → [14.1225:1271]
```
  if current_app_is_warning() then return end
```
Solving an order conflict in main.lua at line 269 [8.2]
[7.1118]
[33.71]
Deletion in main.lua at line 272 [8.2]
B:BD[34.456] → [13.868:909]
BD:BD[34.456] → [13.868:909]
BD:BD[34.456] → [13.868:909]
```
    elseif current_app_is_warning() then
```
Solving an order conflict in main.lua at line 272 [8.2]
[29.466]
[36.201]
Deletion in main.lua at line 275 [8.2]
B:BD[36.503] → [36.503:507]
B:BD[36.507] → [4.131:131]
B:BD[16.190302] → [21.1574:1650]
BD:BD[16.190302] → [21.1574:1650]
BD:BD[16.190302] → [21.1574:1650]
B:BD[17.190738] → [14.1368:1414]
BD:BD[17.190738] → [14.1368:1414]
B:BD[17.190074] → [14.1272:1318]
BD:BD[17.190074] → [14.1272:1318]
B:BD[38.889] → [14.1320:1320]
BD:BD[38.889] → [14.1320:1320]
BD:BD[38.889] → [14.1320:1320]
BD:BD[38.889] → [14.1320:1320]
B:BD[38.1071] → [14.1321:1367]
BD:BD[38.1071] → [14.1321:1367]
BD:BD[38.1071] → [14.1321:1367]
∅:D[14.1320] → [13.1098:1144]
B:BD[40.925] → [13.1098:1144]
BD:BD[40.925] → [13.1098:1144]
BD:BD[40.925] → [13.1098:1144]
B:BD[16.191780] → [13.1192:1474]
BD:BD[16.191780] → [13.1192:1474]
BD:BD[16.191780] → [13.1192:1474]
B:BD[41.268] → [13.1475:1577]
BD:BD[41.268] → [13.1475:1577]
```
end
  if Skip_rest_of_key_events then return end
  if Current_app == 'run' then
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
end
function current_app_is_warning()
  return type(Current_app) == 'table' and Current_app.name == 'warning'
end
function show_warning(message)
  assert(type(Current_app) == 'string')
  Current_app = {
    name = 'warning',
    message = message,
    next_app = Current_app,
  }
function clear_warning()
  assert(type(Current_app) == 'table')
  Current_app = Current_app.next_app
```
Resurrecting zombie bytes in main.lua at line 275 [8.2]
B:B[13.1577] → [13.1577:1581]
BD:B[13.1577] → [13.1577:1581]
```
end
```
Solving an order conflict in main.lua at line 275 [8.2]
[36.336]
[13.1577]
Deletion in main.lua at line 276 [8.2]
B:BD[13.1581] → [5.175:175]
BD:BD[13.1581] → [5.175:175]
B:BD[16.187701] → [14.981:1027]
BD:BD[16.187701] → [14.981:1027]
BD:BD[16.187701] → [14.981:1027]
B:BD[42.4536] → [14.1029:1029]
BD:BD[42.4536] → [14.1029:1029]
BD:BD[42.4536] → [14.1029:1029]
B:BD[30.1320] → [21.698:785]
BD:BD[30.1320] → [21.698:785]
B:BD[21.785] → [13.323:521]
BD:BD[21.785] → [13.323:521]
∅:D[13.521] → [21.1031:1136]
B:BD[21.1031] → [21.1031:1136]
BD:BD[21.1031] → [21.1031:1136]
B:BD[16.187407] → [13.522:568]
BD:BD[16.187407] → [13.522:568]
```
  if current_app_is_warning() then return end
function check_love_version()
  if array.find(Supported_versions, Version) == nil then
    show_warning(
      ("This app hasn't been tested with LÖVE version %s; please switch to version %s if you run into issues. Press any key to continue."):format(Version, Supported_versions[1]))
    -- continue initializing everything; hopefully we won't have errors during initialization
  end
end
  if current_app_is_warning() then return end
```
Solving an order conflict in main.lua at line 276 [8.2]
[13.1581]
Insertion in app.lua at line 10 [43.2]
[43.54]
[44.4069]
```
  Version, Major_version = App.love_version()
```

Replacement in app.lua at line 16 [43.2]

B:BD[2.61] → [2.61:131]

    error('There were test failures:\n\n'..table.concat(Test_errors))

[2.61]

[2.131]

    local error_message = ''
    if Warning_before_tests then
      error_message = Warning_before_tests..'\n\n'
    end
    error_message = error_message .. ('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors))
    error(error_message)

Deletion in app.lua at line 25 [43.2]
B:BD[45.276] → [4.140:162]
```
  App.version_check()
```

Replacement in app.lua at line 63 [43.2]

B:BD[30.5849] → [14.1479:1653]

BD:BD[30.5849] → [14.1479:1653]

∅:D[46.17] → [47.630:639]

B:BD[30.5830] → [47.630:639]

B:BD[17.209590] → [46.17:17]

B:BD[17.209589] → [17.209589:209590]

function App.love_version()
  local major_version, minor_version = love.getVersion()
  local version = major_version..'.'..minor_version
  return version, major_version
end
App = {}

[47.629]

[46.18]


App = {}
function App.love_version()
  local major_version, minor_version = love.getVersion()
  local version = major_version..'.'..minor_version
  return version, major_version
end

Deletion in app.lua at line 489 [43.2]

B:BD[30.8166] → [14.1924:1924]

B:BD[48.35229] → [14.1654:1922]

BD:BD[48.35229] → [14.1654:1922]

B:BD[43.54] → [14.1432:1478]

BD:BD[43.54] → [14.1432:1478]

    local error_message = ''
    if Warning_before_tests then
      error_message = Warning_before_tests..'\n\n'
    end
    error_message = error_message .. ('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors))
    error(error_message)
  Version, Major_version = App.love_version()

Solving an order conflict in app.lua at line 489 [43.2]
[30.8166]

Deletion in Manual_tests.md at line 15 [51.1]

B:BD[50.40] → [50.40:179]

BD:BD[50.40] → [50.40:179]

  - run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

Resurrecting zombie bytes in Manual_tests.md at line 15 [51.1]
B:B[50.179] → [4.169:271]
BD:B[50.179] → [4.169:271]
```
Code loading:
* run love with directory; text editor runs
* run love with zip file; text editor runs
```

Insertion in Manual_tests.md at line 15 [51.1]

[50.40]

[4.169]

  - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.

Deletion in Manual_tests.md at line 21 [51.1]

B:BD[50.40] → [14.1929:2163]

  - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.

Solving an order conflict in Manual_tests.md at line 21 [51.1]
[4.271]
[52.158]

Deletion in Manual_tests.md at line 53 [51.1]

B:BD[53.16279] → [14.2165:2165]

B:BD[16.211526] → [21.1670:1918]

BD:BD[16.211526] → [21.1670:1918]

∅:D[21.1918] → [22.1971:2103]

B:BD[22.1971] → [22.1971:2103]

BD:BD[22.1971] → [22.1971:2103]

* run with an untested version. Error message pops up. Press a key. Text editor comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Text editor returns.
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.

Solving an order conflict in Manual_tests.md at line 53 [51.1]
[53.16279]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 16 [8.2]

Insertion in main.lua at line 18 [8.2]

Deletion in main.lua at line 25 [8.2]

Resurrecting zombie bytes in main.lua at line 25 [8.2]

Solving an order conflict in main.lua at line 25 [8.2]

Deletion in main.lua at line 26 [8.2]

Deletion in main.lua at line 30 [8.2]

Deletion in main.lua at line 31 [8.2]

Insertion in main.lua at line 39 [8.2]

Deletion in main.lua at line 48 [8.2]

Solving an order conflict in main.lua at line 48 [8.2]

Deletion in main.lua at line 51 [8.2]

Deletion in main.lua at line 78 [8.2]

Solving an order conflict in main.lua at line 78 [8.2]

Insertion in main.lua at line 78 [8.2]

Replacement in main.lua at line 184 [8.2]

Deletion in main.lua at line 188 [8.2]

Solving an order conflict in main.lua at line 188 [8.2]

Deletion in main.lua at line 193 [8.2]

Deletion in main.lua at line 252 [8.2]

Solving an order conflict in main.lua at line 252 [8.2]

Deletion in main.lua at line 256 [8.2]

Solving an order conflict in main.lua at line 256 [8.2]

Deletion in main.lua at line 262 [8.2]

Solving an order conflict in main.lua at line 262 [8.2]

Deletion in main.lua at line 269 [8.2]

Solving an order conflict in main.lua at line 269 [8.2]

Deletion in main.lua at line 272 [8.2]

Solving an order conflict in main.lua at line 272 [8.2]

Deletion in main.lua at line 275 [8.2]

Resurrecting zombie bytes in main.lua at line 275 [8.2]

Solving an order conflict in main.lua at line 275 [8.2]

Deletion in main.lua at line 276 [8.2]

Solving an order conflict in main.lua at line 276 [8.2]

Insertion in app.lua at line 10 [43.2]

Replacement in app.lua at line 16 [43.2]

Deletion in app.lua at line 25 [43.2]

Replacement in app.lua at line 63 [43.2]

Deletion in app.lua at line 489 [43.2]

Solving an order conflict in app.lua at line 489 [43.2]

Deletion in Manual_tests.md at line 15 [51.1]

Resurrecting zombie bytes in Manual_tests.md at line 15 [51.1]

Insertion in Manual_tests.md at line 15 [51.1]

Deletion in Manual_tests.md at line 21 [51.1]

Solving an order conflict in Manual_tests.md at line 21 [51.1]

Deletion in Manual_tests.md at line 53 [51.1]

Solving an order conflict in Manual_tests.md at line 53 [51.1]