akkartik/techmeet-capture.love - Change 6XLI6GURIVGWW7MOXND4BJVUNZJMJVGKRC3HAC3BBHWXMTI6ADHAC

resolve conflicts

Created by akkartik on December 7, 2023

6XLI6GURIVGWW7MOXND4BJVUNZJMJVGKRC3HAC3BBHWXMTI6ADHAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 42 [6.2]
B:BD[4.127] → [5.371:430]
∅:D[5.430] → [7.9:9]
B:BD[8.197] → [7.9:9]
```
  if Current_app == nil then
    Current_app = 'run'
  end
```

Resurrecting zombie bytes in main.lua at line 42 [6.2]

B:B[4.127] → [3.0:106]

BD:B[4.127] → [3.0:106]

  -- Current_app =
  --  | run
  --  | source
  --  | {name=warning message='...' next_app = run|source}

Insertion in main.lua at line 47 [6.2]

[3.106]

[9.8]

  if Current_app == nil then
    Current_app = 'run'
  end

Replacement in main.lua at line 74 [6.2]
B:BD[10.186724] → [11.20:57]
```
  elseif Current_app == 'error' then
```
[10.186724]
[12.16]
```
  elseif current_app_is_warning() then
```

Replacement in main.lua at line 80 [6.2]

B:BD[13.31] → [13.31:198]

B:BD[13.198] → [2.20:112]

∅:D[2.112] → [13.282:776]

B:BD[13.282] → [13.282:776]

∅:D[12.76] → [5.431:437]

∅:D[13.776] → [5.431:437]

B:BD[10.186724] → [5.431:437]

BD:BD[12.76] → [5.431:437]

BD:BD[13.776] → [5.431:437]

BD:BD[10.186724] → [5.431:437]

B:BD[5.437] → [2.114:114]

BD:BD[5.437] → [2.114:114]

∅:D[11.59] → [10.186725:186729]

∅:D[2.114] → [10.186725:186729]

∅:D[5.437] → [10.186725:186729]

B:BD[9.88] → [10.186725:186729]

BD:BD[9.88] → [10.186725:186729]

function App.version_check()
  -- available modes: run, error
  Error_message = nil
  Error_count = 0
  -- we'll reuse error mode on load for an initial version check
  local supported_versions = {'11.5', '11.4', '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) == nil then
    Current_app = 'error'
    Error_message = ("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])
    print(Error_message)
    -- continue initializing everything; hopefully we won't have errors during initialization
  end
end

[13.31]

[15.8]

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

Insertion in main.lua at line 168 [6.2]
[5.579]
[5.579]
```
  if current_app_is_warning() then return end
```
Deletion in main.lua at line 176 [6.2]
B:BD[5.807] → [11.60:97]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 365 [6.2]
B:BD[16.268] → [13.778:778]
Deletion in main.lua at line 370 [6.2]
B:BD[10.188032] → [3.616:662]
BD:BD[10.188032] → [3.616:662]
B:BD[10.186724] → [3.107:146]
BD:BD[10.186724] → [3.107:146]
```
  if current_app_is_warning() then return end
  elseif current_app_is_warning() then
```
Solving an order conflict in main.lua at line 370 [6.2]
[3.1581]

Replacement in Manual_tests.md at line 33 [17.1]

B:BD[10.211526] → [2.134:349]

* 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. Press ctrl+e to edit source. Source editor opens up without checking version.

[10.211526]

[5.907]

* 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.

Deletion in Manual_tests.md at line 39 [17.1]

B:BD[18.328] → [2.351:351]

B:BD[10.211526] → [19.1670:1918]

∅:D[19.1918] → [14.1971:2103]

B:BD[14.1971] → [14.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 39 [17.1]
[18.328]
[10.211526]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 42 [6.2]

Resurrecting zombie bytes in main.lua at line 42 [6.2]

Insertion in main.lua at line 47 [6.2]

Replacement in main.lua at line 74 [6.2]

Replacement in main.lua at line 80 [6.2]

Insertion in main.lua at line 168 [6.2]

Deletion in main.lua at line 176 [6.2]

Deletion in main.lua at line 365 [6.2]

Deletion in main.lua at line 370 [6.2]

Solving an order conflict in main.lua at line 370 [6.2]

Replacement in Manual_tests.md at line 33 [17.1]

Deletion in Manual_tests.md at line 39 [17.1]

Solving an order conflict in Manual_tests.md at line 39 [17.1]