akkartik/techmeet-capture.love - Change 53GCKYYSOMELQH4I7S575PCM5AMXPHLQZKRBX2MT3BNJ6FW4J3UQC

resolve conflicts

Created by akkartik on May 6, 2025

53GCKYYSOMELQH4I7S575PCM5AMXPHLQZKRBX2MT3BNJ6FW4J3UQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in main.lua at line 213 [6.2]
∅:∅[4.2203] → [5.188715:188787]
∅:∅[7.4577] → [5.188715:188787]
B:B[5.188715] → [5.188715:188787]
BD:B[7.4577] → [5.188715:188787]
```
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Resurrecting zombie bytes in main.lua at line 215 [6.2]
∅:∅[8.619] → [5.188836:188858]
B:B[5.188836] → [5.188836:188858]
BD:B[5.188836] → [5.188836:188858]
```
    return
  end
  --
```

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

∅:∅[9.1179] → [5.188858:189132]

B:B[5.188858] → [5.188858:189132]

BD:B[5.188858] → [5.188858:189132]

  if chord == 'C-e' then
    -- carefully save settings
    if Current_app == 'run' then
      local source_settings = Settings.source
      Settings = run.settings()
      Settings.source = source_settings
      if run.quit then run.quit() end
      Current_app = 'source'

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

∅:∅[10.429] → [5.189132:189284]

B:B[5.189132] → [5.189132:189284]

BD:B[5.189132] → [5.189132:189284]

    elseif Current_app == 'source' then
      Settings.source = source.settings()
      if source.quit then source.quit() end
      Current_app = 'run'

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

∅:∅[11.445] → [5.189284:189585]

∅:∅[10.456] → [5.189284:189585]

∅:∅[12.909] → [5.189284:189585]

B:B[5.189284] → [5.189284:189585]

BD:B[5.189284] → [5.189284:189585]

    else
      assert(false, 'unknown app "'..Current_app..'"')
    end
    Settings.current_app = Current_app
    love.filesystem.write('config', json.encode(Settings))
    -- reboot
    load_file_from_source_or_save_directory('main.lua')
    App.undo_initialize()
    App.run_tests_and_initialize()

Resurrecting zombie bytes in main.lua at line 253 [6.2]
∅:∅[13.1482] → [5.189585:189596]
B:B[5.189585] → [5.189585:189596]
BD:B[5.189585] → [5.189585:189596]
```
    return
```
Resurrecting zombie bytes in main.lua at line 257 [6.2]
∅:∅[4.2291] → [5.189698:189736]
∅:∅[7.4644] → [5.189698:189736]
B:B[5.189698] → [5.189698:189736]
BD:B[7.4644] → [5.189698:189736]
```
  elseif Current_app == 'source' then
```
Resurrecting zombie bytes in main.lua at line 259 [6.2]
∅:∅[11.483] → [5.189812:189872]
∅:∅[4.2385] → [5.189812:189872]
∅:∅[7.4717] → [5.189812:189872]
B:B[5.189812] → [5.189812:189872]
BD:B[7.4717] → [5.189812:189872]
BD:B[5.189812] → [5.189812:189872]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
```

Replacement in edit.lua at line 231 [15.413]

B:BD[14.3400] → [14.3400:3452]

function edit.mouse_press(State, x,y, mouse_button)

[14.3400]

[14.3452]

function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)

Replacement in edit.lua at line 278 [15.413]

B:BD[14.5354] → [14.5354:5420]

        Drawing.mouse_press(State, line_index, x,y, mouse_button)

[14.5354]

[14.5420]

        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)

Replacement in edit.lua at line 291 [15.413]

B:BD[14.5772] → [14.5772:5826]

function edit.mouse_release(State, x,y, mouse_button)

[14.5772]

[14.5826]

function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in edit.lua at line 296 [15.413]

B:BD[14.6010] → [14.6010:6062]

    Drawing.mouse_release(State, x,y, mouse_button)

[14.6010]

[14.6087]

    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in edit.lua at line 382 [15.413]

B:BD[14.8791] → [14.8791:8839]

function edit.keychord_press(State, chord, key)

[14.8791]

[14.8839]

function edit.keychord_press(State, chord, key, scancode, is_repeat)

Replacement in edit.lua at line 501 [15.413]

B:BD[14.14010] → [14.14010:14053]

      Drawing.keychord_press(State, chord)

[14.14010]

[14.14053]

      Drawing.keychord_press(State, chord, key, scancode, is_repeat)

Replacement in edit.lua at line 534 [15.413]

B:BD[14.15458] → [14.15458:15496]

    Text.keychord_press(State, chord)

[14.15351]

[16.827]

    Text.keychord_press(State, chord, key, scancode, is_repeat)

Deletion in edit.lua at line 611 [15.413]

B:BD[14.17561] → [3.285:285]

B:BD[15.15878] → [4.3786:3850]

BD:BD[15.15878] → [4.3786:3850]

B:BD[17.2865] → [4.3716:3785]

BD:BD[17.2865] → [4.3716:3785]

B:BD[15.10343] → [4.3646:3715]

BD:BD[15.10343] → [4.3646:3715]

B:BD[18.5377] → [4.3574:3645]

BD:BD[18.5377] → [4.3574:3645]

B:BD[15.8364] → [4.3500:3573]

BD:BD[15.8364] → [4.3500:3573]

B:BD[17.2295] → [4.3414:3499]

BD:BD[17.2295] → [4.3414:3499]

B:BD[15.6757] → [4.3342:3413]

BD:BD[15.6757] → [4.3342:3413]

    Text.keychord_press(State, chord, key, scancode, is_repeat)
      Drawing.keychord_press(State, chord, key, scancode, is_repeat)
function edit.keychord_press(State, chord, key, scancode, is_repeat)
    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)
        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)
function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)

Solving an order conflict in edit.lua at line 611 [15.413]
[14.17561]