akkartik/lines-polygon-experiment - Change N4R5DA3JKVIRNLOAFPR7GGFIAHALGBNQQKPINNFOXBH6KUDVL4QQC

resolve conflicts

Created by akkartik yesterday at 17:22

N4R5DA3JKVIRNLOAFPR7GGFIAHALGBNQQKPINNFOXBH6KUDVL4QQC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 212 [5.2]
B:BD[4.63] → [2.18:18]
BD:BD[4.63] → [2.18:18]
∅:D[2.18] → [6.4537:4577]
B:BD[7.8] → [6.4537:4577]
BD:BD[7.8] → [6.4537:4577]
```
function App.keychord_press(chord, key)
```
Resurrecting zombie bytes in main.lua at line 212 [5.2]
B:B[7.8] → [3.2142:2203]
BD:B[7.8] → [3.2142:2203]
```
function App.keychord_press(chord, key, scancode, is_repeat)
```
Solving an order conflict in main.lua at line 212 [5.2]
[4.63]
[3.2142]
Resurrecting zombie bytes in main.lua at line 213 [5.2]
∅:∅[3.2203] → [9.188715:188787]
∅:∅[6.4577] → [9.188715:188787]
B:B[9.188715] → [9.188715:188787]
BD:B[6.4577] → [9.188715:188787]
```
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Resurrecting zombie bytes in main.lua at line 215 [5.2]
∅:∅[10.619] → [9.188836:188858]
B:B[9.188836] → [9.188836:188858]
BD:B[9.188836] → [9.188836:188858]
```
    return
  end
  --
```

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

∅:∅[11.1179] → [9.188858:189132]

B:B[9.188858] → [9.188858:189132]

BD:B[9.188858] → [9.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 [5.2]

∅:∅[12.429] → [9.189132:189284]

B:B[9.189132] → [9.189132:189284]

BD:B[9.189132] → [9.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 [5.2]

∅:∅[13.445] → [9.189284:189585]

∅:∅[12.456] → [9.189284:189585]

∅:∅[14.909] → [9.189284:189585]

B:B[9.189284] → [9.189284:189585]

BD:B[9.189284] → [9.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 [5.2]
∅:∅[15.1482] → [9.189585:189596]
B:B[9.189585] → [9.189585:189596]
BD:B[9.189585] → [9.189585:189596]
```
    return
```

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 212 [5.2]

Resurrecting zombie bytes in main.lua at line 212 [5.2]

Solving an order conflict in main.lua at line 212 [5.2]

Resurrecting zombie bytes in main.lua at line 213 [5.2]

Resurrecting zombie bytes in main.lua at line 215 [5.2]

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

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

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

Resurrecting zombie bytes in main.lua at line 253 [5.2]