pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
Nov 11, 2023, 12:50 AM
7UUGFVEQ436EMCHUMLKZ6GDEGWKLZCSENDSFDNBMG4W2YCVQRTMAC

Dependencies

  • [2] AFZEVZOU resolve conflicts
  • [3] 3YTMIHTW improve a name
  • [4] IZGZEWFG switch to source editor on error
  • [5] NLU6BXIR clean up some cruft from error callstacks
  • [6] R6MB3UPB Merge text.love
  • [7] CUFW4EJL reorganize app.lua and its comments
  • [8] AGJXIDOF hardcode some assumptions about how this app uses love
  • [*] 3QNOKBFM beginnings of a test harness

Change contents

  • edit in app.lua at line 49
    [4.60]→[3.35:119](∅→∅),[4.60]→[3.35:119](∅→∅),[4.60]→[3.35:119](∅→∅),[4.408]→[3.120:161](∅→∅),[4.408]→[3.120:161](∅→∅)
    Error_message = 'Error: ' .. tostring(err)..'\n'..cleaned_up_callstack(callstack)
    function cleaned_up_callstack(callstack)
  • resurrect zombie in app.lua at line 49
    [4.920]→[4.920:926](∅→∅),[4.920]→[4.920:926](∅→∅),[4.1035]→[4.1035:1039](∅→∅),[4.1035]→[4.1035:1039](∅→∅),[4.1039]→[4.1039:1040](∅→∅),[4.1039]→[4.1039:1040](∅→∅)
    end
    end