resolve conflicts

akkartik

Nov 13, 2023, 3:54 AM

LHG2QWSOMAYE4RTOFLL5H53GHUFBUOSEM3Y4TL343IENBOAHG6GAC

Dependencies

• [2] YF2ATH2Q Merge lines.love
• [3] 7SICLTED check for 'error' mode in a few more places
• [4] KKMFQDR4 editing source code from within the app
• [5] UH4YWHW5 button framework is at the app level
• [6] 2CTN2IEF Merge lines.love
• [7] VP5KC4XZ Merge lines.love
• [8] YGCT2D2O start loading settings as applicable
• [9] AVTNUQYR basic test-enabled framework
• [10] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [11] LNUHQOGH start passing in Editor_state explicitly
• [12] ZNLTRNNK highlight another global
• [13] JOPVPUSA editing source code from within the app
• [14] 2L5MEZV3 experiment: new edit namespace
• [15] 2CK5QI7W make love event names consistent
• [16] MHOUX5JF experiment: turn off JIT
• [17] PP2IIHL6 stop putting button state in a global
• [18] ORKN6EOB Merge lines.love
• [19] XGHCLIKB Merge lines.love
• [20] 6VJTQKW7 start supporting LÖVE v12
• [21] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 89
  [4.186894]→[3.38:75](∅→∅),[4.186894]→[3.38:75](∅→∅)
  − elseif Current_app == 'error' then
• edit in main.lua at line 95
  [4.186411]

  [4.186411]
  + elseif Current_app == 'error' then
• edit in main.lua at line 139
  [4.4536]

  [4.187341]
  + elseif Current_app == 'error' then
• replacement in main.lua at line 160
  [4.1373]→[2.511:544](∅→∅)
  − if Current_app == 'error' then
  [4.1373]

  [2.544]
  + if Current_app == 'run' then

  + run.draw()

  + elseif Current_app == 'source' then

  + source.draw()

  + elseif Current_app == 'error' then
• edit in main.lua at line 169
  [2.742]→[2.742:777](∅→∅),[2.777]→[4.187814:187885](∅→∅),[4.187814]→[4.187814:187885](∅→∅)
  − elseif Current_app == 'run' then

  − run.draw()

  − elseif Current_app == 'source' then

  − source.draw()
• edit in main.lua at line 172
  [4.187951]→[2.779:779](∅→∅),[4.1373]→[3.228:367](∅→∅),[4.1373]→[3.228:367](∅→∅)
  −

  − if Current_app == 'run' then

  − run.draw()

  − elseif Current_app == 'source' then

  − source.draw()

  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 172
  [4.187951]

  [4.416]
• edit in main.lua at line 323
  [4.268]→[2.1042:1042](∅→∅),[4.4536]→[3.152:189](∅→∅),[4.4536]→[3.152:189](∅→∅)
  −

  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 323
  [4.268]