akkartik/pong.love - Change GHECZJMGXLBLIO3XGGDMYURP2BYB4CHAOZSLY6EQLYSVK6IH64XQC

resolve conflicts

Created by akkartik on January 6, 2026

GHECZJMGXLBLIO3XGGDMYURP2BYB4CHAOZSLY6EQLYSVK6IH64XQC

Dependencies

In channels

main

Change contents

File deletion: run.lua, run.lua

BF:BFD[4.2] → [5.183867:183898]

BF:BFD[5.183898] → [5.178107:178107]

BF:BFD[4.2] → [5.183867:183898]

B:BD[6.1916] → [7.739:763]

∅:D[7.763] → [6.1973:2214]

  if OS == 'Linux' then
    -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
    App.screen.move(settings.x, settings.y-37, settings.displayindex)
  else
    App.screen.move(settings.x, settings.y, settings.displayindex)
  end
end

Insertion in text.lua at line 200 [9.1]

[8.87306]

    if State.cursor1.line == 1 and State.cursor1.pos == 1 then
      -- no-op
      return
    end

Replacement in text.lua at line 217 [9.1]

B:BD[8.88019] → [8.88019:88058]

    elseif State.cursor1.line > 1 then

[8.88019]

[8.88058]

    else
      assert(State.cursor1.line > 1)

Deletion in text.lua at line 1018 [9.1]
B:BD[8.115541] → [2.149:149]
B:BD[11.82] → [12.0:99]
BD:BD[11.82] → [12.0:99]
B:BD[14.2600] → [12.100:146]
BD:BD[14.2600] → [12.100:146]
```
      return
    end
    if State.cursor1.line == 1 and State.cursor1.pos == 1 then
      -- no-op
    else
      assert(State.cursor1.line > 1)
```
Solving an order conflict in text.lua at line 1018 [9.1]
[8.115541]
[16.790]

Insertion in source_text.lua at line 277 [5.83786]

[17.5788]

      return
    end
    if State.cursor1.line == 1 and State.cursor1.pos == 1 then
      -- no-op

Replacement in source_text.lua at line 296 [5.83786]
B:BD[17.6522] → [17.6522:6561]
```
    elseif State.cursor1.line > 1 then
```
[17.6522]
[17.6561]
```
    else
      assert(State.cursor1.line > 1)
```
Deletion in source_text.lua at line 1218 [5.83786]
B:BD[17.41315] → [2.299:299]
B:BD[5.101716] → [3.112:158]
BD:BD[5.101716] → [3.112:158]
B:BD[19.21361] → [3.12:111]
BD:BD[19.21361] → [3.12:111]
```
    else
      assert(State.cursor1.line > 1)
      return
    end
    if State.cursor1.line == 1 and State.cursor1.pos == 1 then
      -- no-op
```
Solving an order conflict in source_text.lua at line 1218 [5.83786]
[17.41315]

resolve conflicts

Dependencies

In channels

Change contents

File deletion: run.lua, run.lua

Insertion in text.lua at line 200 [9.1]

Replacement in text.lua at line 217 [9.1]

Deletion in text.lua at line 1018 [9.1]

Solving an order conflict in text.lua at line 1018 [9.1]

Insertion in source_text.lua at line 277 [5.83786]

Replacement in source_text.lua at line 296 [5.83786]

Deletion in source_text.lua at line 1218 [5.83786]

Solving an order conflict in source_text.lua at line 1218 [5.83786]