akkartik/techmeet-capture.love - Change DLKGHBKMLLWWHGJXGYYYAG3YQA5YBEPIODCIY4O46L5PGRS6PXPQC

resolve conflicts

Created by akkartik on November 12, 2025

DLKGHBKMLLWWHGJXGYYYAG3YQA5YBEPIODCIY4O46L5PGRS6PXPQC

Dependencies

In channels

main

Change contents

Deletion in run.lua at line 70 [7.178044]
B:BD[6.130] → [6.130:187]
BD:BD[6.130] → [6.130:187]
```
  local os = love.system.getOS()
  if os == 'Linux' then
```

Resurrecting zombie bytes in run.lua at line 71 [7.178044]

∅:∅[5.621] → [6.187:423]

B:B[6.187] → [6.187:423]

BD:B[6.187] → [6.187:423]

    -- 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

Insertion in main.lua at line 83 [9.2]
[3.273]
[8.8]
```
  OS = love.system.getOS()
```
Insertion in edit.lua at line 394 [12.413]
[10.402]
[11.8839]
```
  local dm = App.default_modifier
```

Replacement in edit.lua at line 400 [12.413]

B:BD[11.9142] → [13.29:214]

      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

[11.9142]

[14.74]

      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 edit.lua at line 429 [12.413]
B:BD[11.10329] → [11.10329:10358]
```
  elseif chord == 'C-f' then
```
[11.10329]
[11.10358]
```
  elseif chord == dm('f') then
```
Replacement in edit.lua at line 436 [12.413]
B:BD[11.10567] → [11.10567:10596]
```
  elseif chord == 'C-=' then
```
[11.10567]
[11.10596]
```
  elseif chord == dm('=') then
```
Replacement in edit.lua at line 439 [12.413]
B:BD[11.10681] → [11.10681:10710]
```
  elseif chord == 'C--' then
```
[11.10681]
[11.10710]
```
  elseif chord == dm('-') then
```
Replacement in edit.lua at line 444 [12.413]
B:BD[11.10841] → [11.10841:10870]
```
  elseif chord == 'C-0' then
```
[11.10841]
[11.10870]
```
  elseif chord == dm('0') then
```
Replacement in edit.lua at line 448 [12.413]
B:BD[11.10948] → [11.10948:10977]
```
  elseif chord == 'C-z' then
```
[11.10948]
[11.11084]
```
  elseif chord == dm('z') then
```
Replacement in edit.lua at line 461 [12.413]
B:BD[11.11660] → [11.11660:11689]
```
  elseif chord == 'C-y' then
```
[11.11660]
[11.11796]
```
  elseif chord == dm('y') then
```
Replacement in edit.lua at line 475 [12.413]
B:BD[11.12316] → [11.12316:12345]
```
  elseif chord == 'C-a' then
```
[11.12316]
[11.12345]
```
  elseif chord == dm('a') then
```
Replacement in edit.lua at line 478 [12.413]
B:BD[11.12472] → [11.12472:12501]
```
  elseif chord == 'C-c' then
```
[11.12472]
[11.12501]
```
  elseif chord == dm('c') then
```
Replacement in edit.lua at line 483 [12.413]
B:BD[11.12586] → [11.12586:12615]
```
  elseif chord == 'C-x' then
```
[11.12586]
[14.130]
```
  elseif chord == dm('x') then
```
Replacement in edit.lua at line 489 [12.413]
B:BD[11.12861] → [11.12861:12890]
```
  elseif chord == 'C-v' then
```
[11.12861]
[11.12997]
```
  elseif chord == dm('v') then
```
Deletion in edit.lua at line 623 [12.413]
B:BD[11.17561] → [4.209:209]
B:BD[15.551] → [5.1484:1515]
BD:BD[15.551] → [5.1484:1515]
B:BD[12.13403] → [5.1452:1483]
BD:BD[12.13403] → [5.1452:1483]
BD:BD[12.13403] → [5.1452:1483]
B:BD[16.657] → [5.1420:1451]
BD:BD[16.657] → [5.1420:1451]
B:BD[12.13212] → [5.1388:1419]
BD:BD[12.13212] → [5.1388:1419]
B:BD[12.12717] → [5.1356:1387]
BD:BD[12.12717] → [5.1356:1387]
B:BD[17.36] → [5.1324:1355]
BD:BD[17.36] → [5.1324:1355]
B:BD[18.289] → [5.1292:1323]
BD:BD[18.289] → [5.1292:1323]
B:BD[19.6814] → [5.1260:1291]
BD:BD[19.6814] → [5.1260:1291]
B:BD[17.25] → [5.1228:1259]
BD:BD[17.25] → [5.1228:1259]
B:BD[12.11758] → [5.1196:1227]
BD:BD[12.11758] → [5.1196:1227]
B:BD[12.10752] → [5.1000:1195]
BD:BD[12.10752] → [5.1000:1195]
BD:BD[12.10752] → [5.1000:1195]
B:BD[20.3715] → [5.965:999]
BD:BD[20.3715] → [5.965:999]
BD:BD[20.3715] → [5.965:999]
```
  elseif chord == dm('v') then
  elseif chord == dm('x') then
  elseif chord == dm('c') then
  elseif chord == dm('a') then
  elseif chord == dm('y') then
  elseif chord == dm('z') then
  elseif chord == dm('0') then
  elseif chord == dm('-') then
  elseif chord == dm('=') then
  elseif chord == dm('f') then
      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
  local dm = App.default_modifier
```
Solving an order conflict in edit.lua at line 623 [12.413]
[11.17561]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in run.lua at line 70 [7.178044]

Resurrecting zombie bytes in run.lua at line 71 [7.178044]

Insertion in main.lua at line 83 [9.2]

Insertion in edit.lua at line 394 [12.413]

Replacement in edit.lua at line 400 [12.413]

Replacement in edit.lua at line 429 [12.413]

Replacement in edit.lua at line 436 [12.413]

Replacement in edit.lua at line 439 [12.413]

Replacement in edit.lua at line 444 [12.413]

Replacement in edit.lua at line 448 [12.413]

Replacement in edit.lua at line 461 [12.413]

Replacement in edit.lua at line 475 [12.413]

Replacement in edit.lua at line 478 [12.413]

Replacement in edit.lua at line 483 [12.413]

Replacement in edit.lua at line 489 [12.413]

Deletion in edit.lua at line 623 [12.413]

Solving an order conflict in edit.lua at line 623 [12.413]