akkartik/etch.love - Change DFQC2W4WAIHBGAI5LQBBHQHUYPV7BW6OK4H6PK7GVW4EEHELZPNAC

resolve conflicts

Created by akkartik on December 7, 2023

DFQC2W4WAIHBGAI5LQBBHQHUYPV7BW6OK4H6PK7GVW4EEHELZPNAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 79 [8.2]
B:BD[7.198] → [5.19:103]
BD:BD[7.198] → [5.19:103]
```
  local supported_versions = {'11.5', '11.4'}  -- put the recommended version first
```

Insertion in main.lua at line 80 [8.2]

[9.179]

  Menu_left, Menu_top = love.window.getSafeArea()

Deletion in main.lua at line 83 [8.2]
∅:D[9.298] → [10.8:9]
∅:D[11.186729] → [10.8:9]
B:BD[12.88] → [10.8:9]
B:BD[11.186764] → [4.313:363]
BD:BD[11.186764] → [4.313:363]
```
  Menu_left, Menu_top = love.window.getSafeArea()
```
Resurrecting zombie bytes in main.lua at line 83 [8.2]
B:B[4.363] → [4.363:364]
BD:B[4.363] → [4.363:364]

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

B:B[13.414] → [14.20:377]

BD:B[13.414] → [14.20:377]

B:B[14.377] → [6.187:282]

BD:B[14.377] → [6.187:282]

∅:∅[6.282] → [14.468:619]

B:B[14.468] → [14.468:619]

BD:B[14.468] → [14.468:619]

∅:∅[14.672] → [9.299:401]

B:B[13.414] → [9.299:401]

BD:B[13.414] → [9.299:401]

B:B[9.432] → [9.432:596]

BD:B[9.432] → [9.432:596]


  -- 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
end
function check_love_version_for_tests()
  if array.find(Supported_versions, Version) == nil then
    -- warning to include in an error message if any tests failed
    Warning_before_tests = ("This app hasn't been tested with LÖVE version %s."):format(Version)

Resurrecting zombie bytes in main.lua at line 126 [8.2]
B:B[11.187263] → [6.283:322]
BD:B[11.187263] → [6.283:322]
B:B[11.187329] → [14.673:697]
BD:B[11.187329] → [14.673:697]
B:B[17.1320] → [14.698:785]
BD:B[17.1320] → [14.698:785]
BD:B[17.1320] → [14.698:785]
B:B[14.785] → [6.323:521]
BD:B[14.785] → [6.323:521]
BD:B[14.785] → [6.323:521]
∅:∅[6.521] → [14.1031:1136]
B:B[14.1031] → [14.1031:1136]
BD:B[14.1031] → [14.1031:1136]
BD:B[14.1031] → [14.1031:1136]
```
  elseif current_app_is_warning() then
  check_love_version()
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
```

Insertion in main.lua at line 127 [8.2]

[6.322]

[14.673]

  else
    assert(false, 'unknown app "'..Current_app..'"')
  end

Insertion in main.lua at line 132 [8.2]
[14.697]
[14.698]
```
end
```
Deletion in main.lua at line 142 [8.2]
B:BD[11.187407] → [6.522:568]
BD:BD[11.187407] → [6.522:568]
B:BD[11.187701] → [6.569:615]
BD:BD[11.187701] → [6.569:615]
B:BD[18.227] → [19.717:795]
BD:BD[18.227] → [19.717:795]
∅:D[18.227] → [11.188255:188321]
∅:D[19.795] → [11.188255:188321]
B:BD[11.188255] → [11.188255:188321]
∅:D[20.16] → [8.183:188]
∅:D[21.70] → [8.183:188]
∅:D[22.71] → [8.183:188]
∅:D[23.75] → [8.183:188]
∅:D[24.119] → [8.183:188]
∅:D[25.155] → [8.183:188]
∅:D[26.163] → [8.183:188]
∅:D[27.858] → [8.183:188]
∅:D[28.86891] → [8.183:188]
∅:D[11.188321] → [8.183:188]
B:BD[8.183] → [8.183:188]
```
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
    App.screen.width, App.screen.height, App.screen.flags = App.screen.size()
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
```
Insertion in main.lua at line 159 [8.2]
[13.521]
[11.188496]
```
  if current_app_is_warning() then return end
```
Resurrecting zombie bytes in main.lua at line 170 [8.2]
B:B[11.188858] → [14.1317:1349]
BD:B[11.188858] → [14.1317:1349]
B:B[14.1349] → [6.809:844]
BD:B[14.1349] → [6.809:844]
```
  Skip_rest_of_key_events = nil
  if current_app_is_warning() then
```
Resurrecting zombie bytes in main.lua at line 218 [8.2]
B:B[17.1512] → [6.910:956]
BD:B[17.1512] → [6.910:956]
B:B[11.189951] → [14.1483:1528]
BD:B[11.189951] → [14.1483:1528]
```
  if current_app_is_warning() then return end
  if Skip_rest_of_key_events then return end
```
Deletion in main.lua at line 230 [8.2]
B:BD[11.190302] → [29.20:53]
BD:BD[11.190302] → [29.20:53]
B:BD[29.53] → [29.53:77]
BD:BD[29.53] → [29.53:77]
B:BD[29.77] → [29.77:112]
BD:BD[29.77] → [29.77:112]
```
  if Current_app == 'error' then
    Current_app = 'run'
  elseif Current_app == 'run' then
```
Resurrecting zombie bytes in main.lua at line 230 [8.2]
B:B[11.190302] → [14.1574:1650]
BD:B[11.190302] → [14.1574:1650]
```
  if Skip_rest_of_key_events then return end
  if Current_app == 'run' then
```
Insertion in main.lua at line 230 [8.2]
[30.57]
[14.1574]
```
  if current_app_is_warning() then return end
```
Deletion in main.lua at line 301 [8.2]
B:BD[31.925] → [6.1098:1144]
BD:BD[31.925] → [6.1098:1144]
B:BD[30.57] → [6.957:1003]
BD:BD[30.57] → [6.957:1003]
B:BD[13.521] → [6.762:808]
BD:BD[13.521] → [6.762:808]
B:BD[11.188032] → [6.616:662]
BD:BD[11.188032] → [6.616:662]
```
  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
```
Solving an order conflict in main.lua at line 301 [8.2]
[6.1581]

Deletion in app.lua at line 111 [33.2]

B:BD[32.60589] → [19.815:973]

    Current_app = 'error'
    Error_message = ('There were %d test failures:\n\n%s'):format(#Test_errors, table.concat(Test_errors))
    print(Error_message)

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 79 [8.2]

Insertion in main.lua at line 80 [8.2]

Deletion in main.lua at line 83 [8.2]

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

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

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

Insertion in main.lua at line 127 [8.2]

Insertion in main.lua at line 132 [8.2]

Deletion in main.lua at line 142 [8.2]

Insertion in main.lua at line 159 [8.2]

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

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

Deletion in main.lua at line 230 [8.2]

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

Insertion in main.lua at line 230 [8.2]

Deletion in main.lua at line 301 [8.2]

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

Deletion in app.lua at line 111 [33.2]