akkartik/wardley.love - Change T5CBNDLNP2LPYRYDRYEGWJSYVK3TTKT4LWDUFWNFVKVMLVFGPW4AC

resolve conflicts

Created by akkartik on September 4, 2023

T5CBNDLNP2LPYRYDRYEGWJSYVK3TTKT4LWDUFWNFVKVMLVFGPW4AC

Dependencies

In channels

main

Change contents

Deletion in app.lua at line 5 [4.2]

B:BD[3.34] → [2.0:63]

--   * recover from errors (by switching to the source editor)

Replacement in app.lua at line 36 [4.2]

B:BD[4.440] → [2.64:142]

        xpcall(function() love.handlers[name](a,b,c,d,e,f) end, handle_error)

[4.440]

[4.481]

        love.handlers[name](a,b,c,d,e,f)

Replacement in app.lua at line 41 [4.2]

B:BD[5.59] → [2.143:199]

    xpcall(function() App.update(dt) end, handle_error)

[5.59]

[5.78]

    App.update(dt)

Replacement in app.lua at line 45 [4.2]
B:BD[6.273] → [2.200:235]
```
    xpcall(App.draw, handle_error)
```
[6.273]
[6.288]
```
    App.draw()
```

Deletion in app.lua at line 52 [4.2]

B:BD[7.2551] → [2.236:673]

function handle_error(err)
  Error_message = debug.traceback('Error: ' .. tostring(err), --[[stack frame]]2):gsub('\n[^\n]+$', '')
  print(Error_message)
  if Current_app == 'run' then
    Settings.current_app = 'source'
    love.filesystem.write('config', json.encode(Settings))
    load_file_from_source_or_save_directory('main.lua')
    App.undo_initialize()
    App.run_tests_and_initialize()
  else
    love.event.quit()
  end
end