akkartik/pong.love - Change K75LHADXTVQ5UHTH7XLYYKIE35ZMLYA2ETXWZURGWJQX5UOPDDZAC

Example repo showing a LÖVE app whose source code can be edited from within the app.

resolve conflicts

Created by akkartik on November 12, 2023

K75LHADXTVQ5UHTH7XLYYKIE35ZMLYA2ETXWZURGWJQX5UOPDDZAC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 59 [7.2]
[5.168]
[6.157407]
```
  elseif Current_app == 'error' then
```
Insertion in main.lua at line 87 [7.2]
[8.1261]
[8.1261]
```
  elseif Current_app == 'error' then
```
Insertion in main.lua at line 108 [7.2]
[9.157]
[10.676]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 119 [7.2]
B:BD[11.186724] → [12.0:37]
BD:BD[11.186724] → [12.0:37]
BD:BD[11.186724] → [12.0:37]
```
  elseif Current_app == 'error' then
```
Resurrecting zombie bytes in main.lua at line 119 [7.2]
B:B[13.186411] → [4.20:57]
BD:B[13.186411] → [4.20:57]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 126 [7.2]
B:BD[10.690] → [2.234:234]
B:BD[11.187263] → [12.76:113]
BD:BD[11.187263] → [12.76:113]
B:BD[11.187568] → [12.114:151]
BD:BD[11.187568] → [12.114:151]
```
  elseif Current_app == 'error' then
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 126 [7.2]
[10.690]
[11.187670]
Insertion in main.lua at line 131 [7.2]
[14.4536]
[15.13202]
```
  elseif Current_app == 'error' then
```
Deletion in main.lua at line 135 [7.2]
B:BD[15.13315] → [10.694:694]
B:BD[11.188255] → [12.190:227]
BD:BD[11.188255] → [12.190:227]
```
  elseif Current_app == 'error' then
```
Insertion in main.lua at line 145 [7.2]
[15.13576]
[15.13576]
```
  elseif Current_app == 'error' then
```

Replacement in main.lua at line 152 [7.2]

B:BD[16.1373] → [3.1763:1796]

  if Current_app == 'error' then

[16.1373]

[3.1796]

  if Current_app == 'pong' then
    pong.draw()
  elseif Current_app == 'source' then
    source.draw()
  elseif Current_app == 'error' then

Deletion in main.lua at line 161 [7.2]
B:BD[3.1994] → [3.1994:2030]
∅:D[3.2030] → [15.13669:13741]
B:BD[15.13669] → [15.13669:13741]
```
  elseif Current_app == 'pong' then
    pong.draw()
  elseif Current_app == 'source' then
    source.draw()
```
Deletion in main.lua at line 164 [7.2]
B:BD[17.1521] → [3.2032:2032]
B:BD[16.1373] → [4.96:235]
BD:BD[16.1373] → [4.96:235]
B:BD[13.187951] → [4.237:237]
BD:BD[13.187951] → [4.237:237]
```
  if Current_app == 'run' then
    run.draw()
  elseif Current_app == 'source' then
    source.draw()
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 164 [7.2]
[17.1521]
[7.416]
Insertion in main.lua at line 207 [7.2]
[18.456]
[19.205]
```
    elseif Current_app == 'error' then
```
Deletion in main.lua at line 284 [7.2]
B:BD[20.456] → [12.406:445]
BD:BD[20.456] → [12.406:445]
BD:BD[20.456] → [12.406:445]
```
    elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 284 [7.2]
[21.644]
[3.2123]
Deletion in main.lua at line 311 [7.2]
B:BD[21.1309] → [3.2216:2216]
B:BD[22.268] → [4.239:239]
BD:BD[22.268] → [4.239:239]
B:BD[14.4536] → [4.58:95]
BD:BD[14.4536] → [4.58:95]
```
  elseif Current_app == 'error' then
```
Solving an order conflict in main.lua at line 311 [7.2]
[21.1309]