akkartik/pong.love - Change AJIHYPZKRIA5OAXJNIK2Y2WTATNCXTUWGBIUOL2FUK257YU34YRQC

resolve conflicts

Created by akkartik on November 12, 2025

AJIHYPZKRIA5OAXJNIK2Y2WTATNCXTUWGBIUOL2FUK257YU34YRQC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[4.2] → [5.177715:177749]

BFD:BFD[5.177749] → [5.165829:165829]

B:BD[7.425] → [3.710:734]

∅:D[3.734] → [7.450:680]

  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)

Replacement in text.lua at line 303 [10.1]

B:BD[8.92074] → [8.92074:92104]

  elseif chord == 'home' then

[8.92074]

[8.92104]

  elseif chord == 'home' or (OS == 'OS X' and chord == 's-left') then

Replacement in text.lua at line 306 [10.1]

B:BD[8.92160] → [8.92160:92189]

  elseif chord == 'end' then

[8.92160]

[8.92189]

  elseif chord == 'end' or (OS == 'OS X' and chord == 's-right') then

Deletion in text.lua at line 1013 [10.1]
B:BD[8.115541] → [9.37:37]
B:BD[11.202] → [12.6:76]
BD:BD[11.202] → [12.6:76]
B:BD[14.5528] → [12.77:147]
BD:BD[14.5528] → [12.77:147]
BD:BD[14.5528] → [12.77:147]
```
  elseif chord == 'home' or (OS == 'OS X' and chord == 's-left') then
  elseif chord == 'end' or (OS == 'OS X' and chord == 's-right') then
```
Solving an order conflict in text.lua at line 1013 [10.1]
[8.115541]
[16.790]

Replacement in source_text.lua at line 389 [5.83786]

B:BD[2.10926] → [2.10926:10956]

  elseif chord == 'home' then

[2.10926]

[2.10956]

  elseif chord == 'home' or (OS == 'OS X' and chord == 's-left') then

Replacement in source_text.lua at line 392 [5.83786]
B:BD[2.11012] → [2.11012:11041]
```
  elseif chord == 'end' then
```
[2.11012]
[2.11041]
```
  elseif chord == 'end' or (OS == 'OS X' and chord == 's-right') then
```
Deletion in source_text.lua at line 1213 [5.83786]
B:BD[17.22256] → [3.83:153]
BD:BD[17.22256] → [3.83:153]
BD:BD[17.22256] → [3.83:153]
B:BD[5.106063] → [3.12:82]
BD:BD[5.106063] → [3.12:82]
```
  elseif chord == 'end' or (OS == 'OS X' and chord == 's-right') then
  elseif chord == 'home' or (OS == 'OS X' and chord == 's-left') then
```
Solving an order conflict in source_text.lua at line 1213 [5.83786]
[2.41315]
Deletion in source_edit.lua at line 287 [5.152503]
B:BD[20.455] → [3.158:192]
BD:BD[20.455] → [3.158:192]
BD:BD[20.455] → [3.158:192]
B:BD[17.25659] → [3.193:388]
BD:BD[17.25659] → [3.193:388]
BD:BD[17.25659] → [3.193:388]
B:BD[5.159233] → [3.389:420]
BD:BD[5.159233] → [3.389:420]
```
  local dm = App.default_modifier
      chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then
  elseif chord == dm('f') then
```
Insertion in source_edit.lua at line 398 [5.152503]
[6.531]
[22.11369]
```
  local dm = App.default_modifier
```

Replacement in source_edit.lua at line 404 [5.152503]

B:BD[22.11672] → [23.11672:11857]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

[22.11672]

[21.347]

      chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then

Replacement in source_edit.lua at line 433 [5.152503]
B:BD[22.12923] → [22.12923:12952]
```
  elseif chord == 'C-f' then
```
[22.12923]
[22.12952]
```
  elseif chord == dm('f') then
```
Replacement in source_edit.lua at line 440 [5.152503]
B:BD[13.151631] → [13.151631:151660]
```
  elseif chord == 'C-=' then
```
[13.151631]
[13.151660]
```
  elseif chord == dm('=') then
```
Replacement in source_edit.lua at line 443 [5.152503]
B:BD[13.151745] → [13.151745:151774]
```
  elseif chord == 'C--' then
```
[13.151745]
[22.13189]
```
  elseif chord == dm('-') then
```
Replacement in source_edit.lua at line 448 [5.152503]
∅:D[22.13320] → [13.151859:151888]
B:BD[13.151859] → [13.151859:151888]
```
  elseif chord == 'C-0' then
```
[22.13320]
[13.151888]
```
  elseif chord == dm('0') then
```
Replacement in source_edit.lua at line 452 [5.152503]
B:BD[13.151966] → [13.151966:151995]
```
  elseif chord == 'C-z' then
```
[13.151966]
[13.152102]
```
  elseif chord == dm('z') then
```
Deletion in source_edit.lua at line 460 [5.152503]
B:BD[5.160465] → [3.421:452]
BD:BD[5.160465] → [3.421:452]
B:BD[5.160579] → [3.453:484]
BD:BD[5.160579] → [3.453:484]
BD:BD[5.160579] → [3.453:484]
B:BD[24.9684] → [3.485:516]
BD:BD[24.9684] → [3.485:516]
BD:BD[24.9684] → [3.485:516]
B:BD[5.160800] → [3.517:548]
BD:BD[5.160800] → [3.517:548]
```
  elseif chord == dm('=') then
  elseif chord == dm('-') then
  elseif chord == dm('0') then
  elseif chord == dm('z') then
```
Solving an order conflict in source_edit.lua at line 460 [5.152503]
[13.152333]
[25.21582]
Replacement in source_edit.lua at line 465 [5.152503]
B:BD[13.152541] → [13.152541:152570]
```
  elseif chord == 'C-y' then
```
[13.152541]
[13.152677]
```
  elseif chord == dm('y') then
```
Deletion in source_edit.lua at line 471 [5.152503]
B:BD[13.152855] → [26.1725:1725]
B:BD[5.161374] → [3.549:580]
BD:BD[5.161374] → [3.549:580]
```
  elseif chord == dm('y') then
```
Solving an order conflict in source_edit.lua at line 471 [5.152503]
[13.152855]
[17.25968]
Replacement in source_edit.lua at line 479 [5.152503]
B:BD[13.153060] → [27.164:193]
```
  elseif chord == 'C-a' then
```
[13.153060]
[27.193]
```
  elseif chord == dm('a') then
```
Replacement in source_edit.lua at line 482 [5.152503]
∅:D[27.330] → [13.153060:153089]
∅:D[22.13411] → [13.153060:153089]
B:BD[13.153060] → [13.153060:153089]
```
  elseif chord == 'C-c' then
```
[22.13411]
[13.153089]
```
  elseif chord == dm('c') then
```
Replacement in source_edit.lua at line 487 [5.152503]
B:BD[13.153177] → [13.153177:153206]
```
  elseif chord == 'C-x' then
```
[13.153177]
[21.403]
```
  elseif chord == dm('x') then
```
Replacement in source_edit.lua at line 493 [5.152503]
B:BD[13.153455] → [13.153455:153484]
```
  elseif chord == 'C-v' then
```
[13.153455]
[13.153591]
```
  elseif chord == dm('v') then
```
Deletion in source_edit.lua at line 510 [5.152503]
B:BD[13.154203] → [21.467:467]
B:BD[5.161892] → [3.581:612]
BD:BD[5.161892] → [3.581:612]
BD:BD[5.161892] → [3.581:612]
B:BD[24.9773] → [3.613:644]
BD:BD[24.9773] → [3.613:644]
BD:BD[24.9773] → [3.613:644]
B:BD[5.162009] → [3.645:676]
BD:BD[5.162009] → [3.645:676]
BD:BD[5.162009] → [3.645:676]
B:BD[5.162287] → [3.677:708]
BD:BD[5.162287] → [3.677:708]
```
  elseif chord == dm('a') then
  elseif chord == dm('c') then
  elseif chord == dm('x') then
  elseif chord == dm('v') then
```
Solving an order conflict in source_edit.lua at line 510 [5.152503]
[13.154203]
[28.391]
Replacement in source.lua at line 139 [31.5]
∅:D[29.425] → [30.122:155]
B:BD[30.122] → [30.122:155]
B:BD[30.155] → [29.426:450]
```
  local os = love.system.getOS()
  if os == 'Linux' then
```
[29.425]
[29.450]
```
  if OS == 'Linux' then
```
File un-deletion: run.lua, run.lua
BFD:BF[5.183898] → [5.178107:178107]
BFD:BF[4.2] → [5.183867:183898]
BFD:BF[4.2] → [5.183867:183898]
Insertion in main.lua at line 73 [34.2]
[32.321]
[33.127]
```
  OS = love.system.getOS()
```
Deletion in main.lua at line 101 [34.2]
B:BD[35.611] → [3.767:795]
BD:BD[35.611] → [3.767:795]
BD:BD[35.611] → [3.767:795]
```
  OS = love.system.getOS()
```
Solving an order conflict in main.lua at line 101 [34.2]
[36.717]
[37.38]
Deletion in edit.lua at line 297 [39.413]
B:BD[38.6956] → [38.6956:6985]
BD:BD[38.6956] → [38.6956:6985]
```
  elseif chord == 'C-f' then
```

Resurrecting zombie bytes in edit.lua at line 298 [39.413]

∅:∅[3.1069] → [38.6985:7194]

B:B[38.6985] → [38.6985:7194]

BD:B[38.6985] → [38.6985:7194]

    State.search_term = ''
    State.search_backup = {
      cursor={line=State.cursor1.line, pos=State.cursor1.pos},
      screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},
    }
  -- zoom

Deletion in edit.lua at line 304 [39.413]
B:BD[38.7194] → [38.7194:7223]
BD:BD[38.7194] → [38.7194:7223]
```
  elseif chord == 'C-=' then
```
Resurrecting zombie bytes in edit.lua at line 305 [39.413]
∅:∅[3.1101] → [38.7223:7308]
B:B[38.7223] → [38.7223:7308]
BD:B[38.7223] → [38.7223:7308]
```
    edit.update_font_settings(State, State.font_height+2)
    Text.redraw_all(State)
```
Deletion in edit.lua at line 307 [39.413]
B:BD[38.7308] → [38.7308:7337]
BD:BD[38.7308] → [38.7308:7337]
```
  elseif chord == 'C--' then
```
Resurrecting zombie bytes in edit.lua at line 308 [39.413]
∅:∅[3.1133] → [38.7337:7468]
B:B[38.7337] → [38.7337:7468]
BD:B[38.7337] → [38.7337:7468]
```
    if State.font_height > 2 then
      edit.update_font_settings(State, State.font_height-2)
      Text.redraw_all(State)
    end
```
Deletion in edit.lua at line 312 [39.413]
B:BD[38.7468] → [38.7468:7497]
BD:BD[38.7468] → [38.7468:7497]
```
  elseif chord == 'C-0' then
```
Resurrecting zombie bytes in edit.lua at line 313 [39.413]
∅:∅[3.1165] → [38.7497:7575]
B:B[38.7497] → [38.7497:7575]
BD:B[38.7497] → [38.7497:7575]
```
    edit.update_font_settings(State, 20)
    Text.redraw_all(State)
  -- undo
```
Deletion in edit.lua at line 316 [39.413]
B:BD[38.7575] → [38.7575:7604]
BD:BD[38.7575] → [38.7575:7604]
```
  elseif chord == 'C-z' then
```

Resurrecting zombie bytes in edit.lua at line 317 [39.413]

∅:∅[3.1197] → [38.7711:7991]

B:B[38.7711] → [38.7711:7991]

BD:B[38.7711] → [38.7711:7991]

    local event = undo_event(State)
    if event then
      local src = event.before
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.after, event.before)

Resurrecting zombie bytes in edit.lua at line 325 [39.413]
∅:∅[40.1321] → [38.8163:8198]
B:B[38.8163] → [38.8163:8198]
BD:B[38.8163] → [38.8163:8198]
```
      schedule_save(State)
    end
```
Deletion in edit.lua at line 327 [39.413]
B:BD[38.8198] → [38.8198:8227]
BD:BD[38.8198] → [38.8198:8227]
```
  elseif chord == 'C-y' then
```

Resurrecting zombie bytes in edit.lua at line 328 [39.413]

∅:∅[3.1229] → [38.8334:8613]

B:B[38.8334] → [38.8334:8613]

BD:B[38.8334] → [38.8334:8613]

    local event = redo_event(State)
    if event then
      local src = event.after
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.before, event.after)

Resurrecting zombie bytes in edit.lua at line 336 [39.413]
∅:∅[40.1421] → [38.8715:8765]
B:B[38.8715] → [38.8715:8765]
BD:B[38.8715] → [38.8715:8765]
```
      schedule_save(State)
    end
  -- clipboard
```
Deletion in edit.lua at line 339 [39.413]
B:BD[38.8765] → [38.8765:8794]
BD:BD[38.8765] → [38.8765:8794]
```
  elseif chord == 'C-a' then
```
Resurrecting zombie bytes in edit.lua at line 340 [39.413]
∅:∅[3.1261] → [38.8794:8921]
B:B[38.8794] → [38.8794:8921]
BD:B[38.8794] → [38.8794:8921]
```
    State.selection1 = {line=1, pos=1}
    State.cursor1 = {line=#State.lines, pos=utf8.len(State.lines[#State.lines].data)+1}
```
Deletion in edit.lua at line 342 [39.413]
B:BD[38.8921] → [38.8921:8950]
BD:BD[38.8921] → [38.8921:8950]
```
  elseif chord == 'C-c' then
```
Resurrecting zombie bytes in edit.lua at line 343 [39.413]
∅:∅[3.1293] → [38.8950:9035]
B:B[38.8950] → [38.8950:9035]
BD:B[38.8950] → [38.8950:9035]
```
    local s = Text.selection(State)
    if s then
      App.set_clipboard(s)
    end
```
Deletion in edit.lua at line 347 [39.413]
B:BD[38.9035] → [38.9035:9064]
BD:BD[38.9035] → [38.9035:9064]
```
  elseif chord == 'C-x' then
```
Resurrecting zombie bytes in edit.lua at line 349 [39.413]
∅:∅[41.427] → [38.9236:9310]
B:B[38.9236] → [38.9236:9310]
BD:B[38.9236] → [38.9236:9310]
```
    if s then
      App.set_clipboard(s)
    end
    schedule_save(State)
```
Deletion in edit.lua at line 353 [39.413]
B:BD[38.9310] → [38.9310:9339]
BD:BD[38.9310] → [38.9310:9339]
```
  elseif chord == 'C-v' then
```

Resurrecting zombie bytes in edit.lua at line 354 [39.413]

∅:∅[3.1357] → [38.9446:10055]

B:B[38.9446] → [38.9446:10055]

BD:B[38.9446] → [38.9446:10055]

B:B[38.10080] → [38.10080:10182]

BD:B[38.10080] → [38.10080:10182]

    -- We don't have a good sense of when to scroll, so we'll be conservative
    -- and sometimes scroll when we didn't quite need to.
    local before_line = State.cursor1.line
    local before = snapshot(State, before_line)
    local clipboard_data = App.get_clipboard()
    for _,code in utf8.codes(clipboard_data) do
      local c = utf8.char(code)
      if c == '\n' then
        Text.insert_return(State)
      else
        Text.insert_at_cursor(State, c)
      end
    end
    if Text.cursor_out_of_screen(State) then
      Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)
    end
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Resurrecting zombie bytes in edit.lua at line 372 [39.413]
∅:∅[28.536] → [38.10204:10211]
B:B[38.10204] → [38.10204:10211]
BD:B[38.10204] → [38.10204:10211]
```
  else
```
Resurrecting zombie bytes in edit.lua at line 374 [39.413]
∅:∅[20.3268] → [38.10356:10420]
B:B[38.10356] → [38.10356:10420]
BD:B[38.10356] → [38.10356:10420]
```
  end
end
function edit.key_release(State, key, scancode)
end
```
Resurrecting zombie bytes in edit.lua at line 381 [39.413]
∅:∅[42.90] → [38.10475:10509]
B:B[38.10475] → [38.10475:10509]
BD:B[38.10475] → [38.10475:10509]
```
  State.font_height = font_height
```

Resurrecting zombie bytes in edit.lua at line 383 [39.413]

∅:∅[42.155] → [38.10575:11061]

∅:∅[43.1696] → [38.10575:11061]

B:B[43.1696] → [38.10575:11061]

B:B[38.10575] → [38.10575:11061]

BD:B[38.10575] → [38.10575:11061]

  State.line_height = math.floor(font_height*1.3)
end
--== some methods for tests
-- Insulate tests from some key globals so I don't have to change the vast
-- majority of tests when they're modified for the real app.
Test_margin_left = 25
Test_margin_right = 0
function edit.initialize_test_state()
  -- if you change these values, tests will start failing
  return edit.initialize_state(
      15,  -- top margin
      Test_margin_left,
      App.screen.width - Test_margin_right,

Resurrecting zombie bytes in edit.lua at line 401 [39.413]

∅:∅[43.1738] → [38.11115:11471]

B:B[38.11115] → [38.11115:11471]

BD:B[38.11115] → [38.11115:11471]

      15)  -- line height
end
-- all text_input events are also keypresses
-- TODO: handle chords of multiple keys
function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
-- not all keys are text_input

Resurrecting zombie bytes in edit.lua at line 419 [39.413]

∅:∅[44.5245] → [38.11587:11811]

B:B[38.11587] → [38.11587:11811]

BD:B[38.11587] → [38.11587:11811]

  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_click(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)

Resurrecting zombie bytes in edit.lua at line 428 [39.413]

∅:∅[45.9188] → [38.11811:12430]

B:B[38.11811] → [38.11811:12430]

BD:B[38.11811] → [38.11811:12430]

  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_press(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_release(State, x,y, mouse_button)
  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source.lua, source.lua

Replacement in text.lua at line 303 [10.1]

Replacement in text.lua at line 306 [10.1]

Deletion in text.lua at line 1013 [10.1]

Solving an order conflict in text.lua at line 1013 [10.1]

Replacement in source_text.lua at line 389 [5.83786]

Replacement in source_text.lua at line 392 [5.83786]

Deletion in source_text.lua at line 1213 [5.83786]

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

Deletion in source_edit.lua at line 287 [5.152503]

Insertion in source_edit.lua at line 398 [5.152503]

Replacement in source_edit.lua at line 404 [5.152503]

Replacement in source_edit.lua at line 433 [5.152503]

Replacement in source_edit.lua at line 440 [5.152503]

Replacement in source_edit.lua at line 443 [5.152503]

Replacement in source_edit.lua at line 448 [5.152503]

Replacement in source_edit.lua at line 452 [5.152503]

Deletion in source_edit.lua at line 460 [5.152503]

Solving an order conflict in source_edit.lua at line 460 [5.152503]

Replacement in source_edit.lua at line 465 [5.152503]

Deletion in source_edit.lua at line 471 [5.152503]

Solving an order conflict in source_edit.lua at line 471 [5.152503]

Replacement in source_edit.lua at line 479 [5.152503]

Replacement in source_edit.lua at line 482 [5.152503]

Replacement in source_edit.lua at line 487 [5.152503]

Replacement in source_edit.lua at line 493 [5.152503]

Deletion in source_edit.lua at line 510 [5.152503]

Solving an order conflict in source_edit.lua at line 510 [5.152503]

Replacement in source.lua at line 139 [31.5]

File un-deletion: run.lua, run.lua

Insertion in main.lua at line 73 [34.2]

Deletion in main.lua at line 101 [34.2]

Solving an order conflict in main.lua at line 101 [34.2]

Deletion in edit.lua at line 297 [39.413]

Resurrecting zombie bytes in edit.lua at line 298 [39.413]

Deletion in edit.lua at line 304 [39.413]

Resurrecting zombie bytes in edit.lua at line 305 [39.413]

Deletion in edit.lua at line 307 [39.413]

Resurrecting zombie bytes in edit.lua at line 308 [39.413]

Deletion in edit.lua at line 312 [39.413]

Resurrecting zombie bytes in edit.lua at line 313 [39.413]

Deletion in edit.lua at line 316 [39.413]

Resurrecting zombie bytes in edit.lua at line 317 [39.413]

Resurrecting zombie bytes in edit.lua at line 325 [39.413]

Deletion in edit.lua at line 327 [39.413]

Resurrecting zombie bytes in edit.lua at line 328 [39.413]

Resurrecting zombie bytes in edit.lua at line 336 [39.413]

Deletion in edit.lua at line 339 [39.413]

Resurrecting zombie bytes in edit.lua at line 340 [39.413]

Deletion in edit.lua at line 342 [39.413]

Resurrecting zombie bytes in edit.lua at line 343 [39.413]

Deletion in edit.lua at line 347 [39.413]

Resurrecting zombie bytes in edit.lua at line 349 [39.413]

Deletion in edit.lua at line 353 [39.413]

Resurrecting zombie bytes in edit.lua at line 354 [39.413]

Resurrecting zombie bytes in edit.lua at line 372 [39.413]

Resurrecting zombie bytes in edit.lua at line 374 [39.413]

Resurrecting zombie bytes in edit.lua at line 381 [39.413]

Resurrecting zombie bytes in edit.lua at line 383 [39.413]

Resurrecting zombie bytes in edit.lua at line 401 [39.413]

Resurrecting zombie bytes in edit.lua at line 419 [39.413]

Resurrecting zombie bytes in edit.lua at line 428 [39.413]