akkartik/techmeet.love - Change KGXJXF63SRWFAYVOE2PFVAFO3WY2LI7UACDFBTPRLPMRZK25LMQAC

resolve conflicts

Created by akkartik on May 6, 2025

KGXJXF63SRWFAYVOE2PFVAFO3WY2LI7UACDFBTPRLPMRZK25LMQAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 222 [12.1]
B:B[10.1180] → [11.3:76]
BD:B[10.1180] → [11.3:76]
```
--?   print('chord', chord, State.selection1.line, State.selection1.pos)
```

Insertion in text.lua at line 222 [12.1]

[10.1137]

[11.3]

function Text.keychord_press(State, chord, key, scancode, is_repeat)

Deletion in text.lua at line 224 [12.1]
B:BD[11.76] → [5.5:5]
B:BD[10.1137] → [9.0:69]
BD:BD[10.1137] → [9.0:69]
```
function Text.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in text.lua at line 224 [12.1]
[11.76]
[14.4]
Resurrecting zombie bytes in run.lua at line 280 [15.178044]
B:B[15.181355] → [9.1556:1581]
BD:B[15.181355] → [9.1556:1581]
```
function run.resize(w,h)
```
Deletion in run.lua at line 281 [15.178044]
B:BD[15.181455] → [15.181455:181500]
```
  App.screen.width, App.screen.height = w, h
```

Replacement in run.lua at line 708 [15.178044]

B:BD[15.183005] → [17.553:597]

function run.mouse_press(x,y, mouse_button)

[15.183005]

[18.3672]

function run.mouse_press(x,y, mouse_button, is_touch, presses)

Deletion in run.lua at line 712 [15.178044]
B:BD[16.24804] → [4.19:19]
B:BD[19.314] → [9.1582:1645]
BD:BD[19.314] → [9.1582:1645]
```
function run.mouse_press(x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in run.lua at line 712 [15.178044]
[16.24804]
[15.183051]

Replacement in run.lua at line 721 [15.178044]

B:BD[16.25207] → [17.649:699]

        edit.mouse_press(pane, x,y, mouse_button)

[16.25207]

[16.25259]

        edit.mouse_press(pane, x,y, mouse_button, is_touch, presses)

Replacement in run.lua at line 737 [15.178044]

B:BD[16.25493] → [17.700:755]

function mouse_press_in_normal_mode(x,y, mouse_button)

[16.25493]

[16.25550]

function mouse_press_in_normal_mode(x,y, mouse_button, is_touch, presses)

Replacement in run.lua at line 753 [15.178044]

B:BD[8.218] → [8.218:270]

          edit.mouse_press(pane, x,y, mouse_button)

[8.218]

[8.270]

          edit.mouse_press(pane, x,y, mouse_button, is_touch, presses)

Deletion in run.lua at line 761 [15.178044]
B:BD[16.26020] → [7.94:94]
B:BD[21.73] → [9.1646:1724]
BD:BD[21.73] → [9.1646:1724]
```
  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in run.lua at line 761 [15.178044]
[16.26020]
[15.183186]

Replacement in run.lua at line 763 [15.178044]

B:BD[15.183191] → [17.807:853]

function run.mouse_release(x,y, mouse_button)

[15.183191]

[18.3710]

function run.mouse_release(x,y, mouse_button, is_touch, presses)

Deletion in run.lua at line 767 [15.178044]
B:BD[16.26055] → [17.855:855]
B:BD[15.183191] → [9.1725:1790]
```
function run.mouse_release(x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in run.lua at line 767 [15.178044]
[16.26055]
[15.183238]

Replacement in run.lua at line 776 [15.178044]

B:BD[8.501] → [8.501:555]

          edit.mouse_release(pane, x,y, mouse_button)

[8.501]

[8.555]

          edit.mouse_release(pane, x,y, mouse_button, is_touch, presses)

Deletion in run.lua at line 782 [15.178044]
B:BD[16.26190] → [17.910:910]
B:BD[15.183312] → [9.1791:1871]
```
  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in run.lua at line 782 [15.178044]
[16.26190]
[15.183374]

Replacement in run.lua at line 896 [15.178044]

B:BD[15.183525] → [17.989:1029]

function run.keychord_press(chord, key)

[15.183525]

[18.3824]

function run.keychord_press(chord, key, scancode, is_repeat)

Deletion in run.lua at line 901 [15.178044]
∅:D[22.136] → [17.1031:1031]
∅:D[23.392] → [17.1031:1031]
∅:D[24.861] → [17.1031:1031]
B:BD[16.28842] → [17.1031:1031]
B:BD[15.183525] → [9.1872:1933]
```
function run.keychord_press(chord, key, scancode, is_repeat)
```
Solving an order conflict in run.lua at line 901 [15.178044]
[22.136]
[15.183567]

Replacement in run.lua at line 932 [15.178044]

∅:D[25.249] → [17.1131:1181]

B:BD[26.2836] → [17.1131:1181]

            edit.keychord_press(pane, chord, key)

[26.2836]

[3.314]

            edit.keychord_press(pane, chord, key, scancode, is_repeat)

Replacement in run.lua at line 946 [15.178044]

B:BD[27.141] → [17.1182:1260]

          keychord_press_in_normal_mode_with_immutable_pane(pane, chord, key)

[27.141]

[26.3138]

          keychord_press_in_normal_mode_with_immutable_pane(pane, chord, key, scancode, is_repeat)

Replacement in run.lua at line 952 [15.178044]
∅:D[6.1653] → [17.1261:1307]
B:BD[16.29927] → [17.1261:1307]
```
    keychord_press_in_search_mode(chord, key)
```
[6.1653]
[6.1654]
```
    keychord_press_in_search_mode(chord, key, scancode, is_repeat)
```

Replacement in run.lua at line 961 [15.178044]

B:BD[16.30352] → [17.1359:1409]

      keychord_press_in_maximize_mode(chord, key)

[16.30352]

[16.30404]

      keychord_press_in_maximize_mode(chord, key, scancode, is_repeat)

Replacement in run.lua at line 1250 [15.178044]

B:BD[16.42113] → [17.1410:1463]

function keychord_press_in_maximize_mode(chord, key)

[16.42113]

[16.42168]

function keychord_press_in_maximize_mode(chord, key, scancode, is_repeat)

Replacement in run.lua at line 1264 [15.178044]

B:BD[16.42474] → [17.1464:1508]

      edit.keychord_press(pane, chord, key)

[16.42474]

[16.42520]

      edit.keychord_press(pane, chord, key, scancode, is_repeat)

Replacement in run.lua at line 1270 [15.178044]

B:BD[16.42619] → [17.1509:1553]

      edit.keychord_press(pane, chord, key)

[16.42619]

[16.42665]

      edit.keychord_press(pane, chord, key, scancode, is_repeat)

Replacement in run.lua at line 1275 [15.178044]

B:BD[16.44779] → [17.1554:1631]

function keychord_press_in_normal_mode_with_immutable_pane(pane, chord, key)

[16.44779]

[16.44858]

function keychord_press_in_normal_mode_with_immutable_pane(pane, chord, key, scancode, is_repeat)

Replacement in run.lua at line 1291 [15.178044]

B:BD[16.45296] → [17.1712:1754]

    edit.keychord_press(pane, chord, key)

[16.45296]

[16.45340]

    edit.keychord_press(pane, chord, key, scancode, is_repeat)

Replacement in run.lua at line 1327 [15.178044]

B:BD[16.46438] → [17.1795:1846]

function keychord_press_in_search_mode(chord, key)

[16.46438]

[16.46491]

function keychord_press_in_search_mode(chord, key, scancode, is_repeat)

Replacement in run.lua at line 1397 [15.178044]

B:BD[16.49423] → [17.1847:1893]

        edit.keychord_press(pane, chord, key)

[16.49423]

[16.49471]

        edit.keychord_press(pane, chord, key, scancode, is_repeat)

Deletion in run.lua at line 1626 [15.178044]
B:BD[16.58255] → [17.1996:1996]
B:BD[15.183641] → [9.1934:2010]
```
  return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
```
Solving an order conflict in run.lua at line 1626 [15.178044]
[16.58255]
[15.183698]
Replacement in main.lua at line 121 [29.2]
B:BD[28.903] → [28.903:932]
```
function App.initialize(arg)
```
[28.903]
[28.1005]
```
function App.initialize(arg, unfiltered_arg)
```
Replacement in main.lua at line 127 [29.2]
B:BD[28.1115] → [28.1115:1139]
```
    run.initialize(arg)
```
[28.1115]
[28.1139]
```
    run.initialize(arg, unfiltered_arg)
```
Replacement in main.lua at line 129 [29.2]
B:BD[28.1177] → [28.1177:1204]
```
    source.initialize(arg)
```
[28.1177]
[28.1204]
```
    source.initialize(arg, unfiltered_arg)
```
Deletion in main.lua at line 134 [29.2]
B:BD[30.1016] → [9.2011:2056]
BD:BD[30.1016] → [9.2011:2056]
BD:BD[30.1016] → [9.2011:2056]
B:BD[15.187174] → [9.2057:2097]
BD:BD[15.187174] → [9.2057:2097]
B:BD[15.187236] → [9.2098:2141]
BD:BD[15.187236] → [9.2098:2141]
BD:BD[15.187236] → [9.2098:2141]
```
function App.initialize(arg, unfiltered_arg)
    run.initialize(arg, unfiltered_arg)
    source.initialize(arg, unfiltered_arg)
```
Solving an order conflict in main.lua at line 134 [29.2]
[32.911]
[33.673]
Deletion in main.lua at line 215 [29.2]
B:BD[34.267] → [17.2081:2081]
BD:BD[34.267] → [17.2081:2081]
∅:D[17.2081] → [10.4537:4577]
B:BD[35.8] → [10.4537:4577]
BD:BD[35.8] → [10.4537:4577]
```
function App.keychord_press(chord, key)
```
Resurrecting zombie bytes in main.lua at line 215 [29.2]
B:B[35.8] → [9.2142:2203]
BD:B[35.8] → [9.2142:2203]
```
function App.keychord_press(chord, key, scancode, is_repeat)
```
Solving an order conflict in main.lua at line 215 [29.2]
[34.267]
[9.2142]
Resurrecting zombie bytes in main.lua at line 216 [29.2]
∅:∅[9.2203] → [15.188715:188787]
∅:∅[10.4577] → [15.188715:188787]
B:B[15.188715] → [15.188715:188787]
BD:B[10.4577] → [15.188715:188787]
```
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Resurrecting zombie bytes in main.lua at line 218 [29.2]
∅:∅[36.619] → [15.188836:188858]
B:B[15.188836] → [15.188836:188858]
BD:B[15.188836] → [15.188836:188858]
```
    return
  end
  --
```
Resurrecting zombie bytes in main.lua at line 232 [29.2]
∅:∅[37.83] → [15.188883:188947]
∅:∅[38.1074] → [15.188883:188947]
∅:∅[16.63521] → [15.188883:188947]
B:B[15.188883] → [15.188883:188947]
BD:B[15.188883] → [15.188883:188947]
```
    -- carefully save settings
    if Current_app == 'run' then
```
Resurrecting zombie bytes in main.lua at line 235 [29.2]
∅:∅[18.4183] → [15.188947:188993]
B:B[15.188947] → [15.188947:188993]
BD:B[15.188947] → [15.188947:188993]
```
      local source_settings = Settings.source
```
Resurrecting zombie bytes in main.lua at line 237 [29.2]
∅:∅[39.75] → [15.189025:189132]
∅:∅[16.63550] → [15.189025:189132]
B:B[15.189025] → [15.189025:189132]
BD:B[15.189025] → [15.189025:189132]
```
      Settings.source = source_settings
      if run.quit then run.quit() end
      Current_app = 'source'
```

Resurrecting zombie bytes in main.lua at line 241 [29.2]

∅:∅[40.429] → [15.189132:189284]

B:B[15.189132] → [15.189132:189284]

BD:B[15.189132] → [15.189132:189284]

    elseif Current_app == 'source' then
      Settings.source = source.settings()
      if source.quit then source.quit() end
      Current_app = 'run'

Resurrecting zombie bytes in main.lua at line 247 [29.2]
∅:∅[41.445] → [15.189284:189395]
∅:∅[40.456] → [15.189284:189395]
∅:∅[42.909] → [15.189284:189395]
B:B[15.189284] → [15.189284:189395]
BD:B[15.189284] → [15.189284:189395]
```
    else
      assert(false, 'unknown app "'..Current_app..'"')
    end
    Settings.current_app = Current_app
```
Resurrecting zombie bytes in main.lua at line 257 [29.2]
∅:∅[43.83] → [15.189585:189596]
∅:∅[33.1482] → [15.189585:189596]
B:B[15.189585] → [15.189585:189596]
BD:B[15.189585] → [15.189585:189596]
```
    return
```

Replacement in main.lua at line 260 [29.2]

∅:D[13.1814] → [17.2082:2148]

B:BD[16.63582] → [17.2082:2148]

    if run.keychord_press then run.keychord_press(chord, key) end

[16.63582]

[16.63652]

    if run.keychord_press then run.keychord_press(chord, key, scancode, is_repeat) end

Replacement in main.lua at line 262 [29.2]

B:BD[16.63690] → [17.2149:2221]

    if source.keychord_press then source.keychord_press(chord, key) end

[16.63690]

[44.1412]

    if source.keychord_press then source.keychord_press(chord, key, scancode, is_repeat) end

Deletion in main.lua at line 302 [29.2]
B:BD[15.190572] → [15.190572:190617]
BD:BD[15.190572] → [15.190572:190617]
```
function App.mousepressed(x,y, mouse_button)
```
Resurrecting zombie bytes in main.lua at line 304 [29.2]
∅:∅[42.1050] → [15.190617:190680]
∅:∅[45.1314] → [15.190617:190680]
B:B[15.190617] → [15.190617:190680]
BD:B[15.190617] → [15.190617:190680]
```
--?   print('mouse press', x,y)
  if Current_app == 'run' then
```
Resurrecting zombie bytes in main.lua at line 307 [29.2]
∅:∅[46.84] → [15.190751:190789]
∅:∅[47.523] → [15.190751:190789]
∅:∅[17.2427] → [15.190751:190789]
∅:∅[9.2537] → [15.190751:190789]
B:B[47.523] → [15.190751:190789]
B:B[15.190751] → [15.190751:190789]
BD:B[46.84] → [15.190751:190789]
BD:B[15.190751] → [15.190751:190789]
```
  elseif Current_app == 'source' then
```
Resurrecting zombie bytes in main.lua at line 309 [29.2]
∅:∅[46.158] → [15.190866:190932]
∅:∅[47.599] → [15.190866:190932]
∅:∅[17.2503] → [15.190866:190932]
∅:∅[9.2630] → [15.190866:190932]
B:B[47.599] → [15.190866:190932]
B:B[15.190866] → [15.190866:190932]
BD:B[46.158] → [15.190866:190932]
BD:B[15.190866] → [15.190866:190932]
B:B[15.190932] → [16.63969:63974]
BD:B[15.190932] → [16.63969:63974]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
```
Deletion in main.lua at line 314 [29.2]
∅:D[16.63974] → [15.190933:190979]
B:BD[48.361] → [15.190933:190979]
BD:BD[48.361] → [15.190933:190979]
B:BD[15.189628] → [9.2204:2291]
BD:BD[15.189628] → [9.2204:2291]
B:BD[15.189736] → [9.2292:2385]
BD:BD[15.189736] → [9.2292:2385]
```
function App.mousereleased(x,y, mouse_button)
    if run.keychord_press then run.keychord_press(chord, key, scancode, is_repeat) end
    if source.keychord_press then source.keychord_press(chord, key, scancode, is_repeat) end
```
Resurrecting zombie bytes in main.lua at line 314 [29.2]
B:B[48.361] → [9.2631:2696]
BD:B[48.361] → [9.2631:2696]
```
function App.mousereleased(x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in main.lua at line 314 [29.2]
[16.63974]
[9.2631]
Resurrecting zombie bytes in main.lua at line 316 [29.2]
∅:∅[42.1097] → [15.190979:191010]
∅:∅[45.1359] → [15.190979:191010]
B:B[15.190979] → [15.190979:191010]
BD:B[15.190979] → [15.190979:191010]
```
  if Current_app == 'run' then
```
Resurrecting zombie bytes in main.lua at line 318 [29.2]
∅:∅[9.2787] → [15.191083:191121]
∅:∅[10.5023] → [15.191083:191121]
B:B[15.191083] → [15.191083:191121]
BD:B[10.5023] → [15.191083:191121]
BD:B[15.191083] → [15.191083:191121]
```
  elseif Current_app == 'source' then
```
Resurrecting zombie bytes in main.lua at line 342 [29.2]
∅:∅[50.1130] → [15.191200:191260]
∅:∅[10.5101] → [15.191200:191260]
B:B[15.191200] → [15.191200:191260]
BD:B[10.5101] → [15.191200:191260]
BD:B[15.191200] → [15.191200:191260]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
```
Resurrecting zombie bytes in edit.lua at line 312 [52.413]
B:B[10.5504] → [51.1624:1724]
BD:B[10.5504] → [51.1624:1724]
```
--?   log(2, os.date('%Y/%m/%d/%H-%M-%S')..' edit.mouse_release a '..tostring(x)..','..tostring(y))
```

Insertion in edit.lua at line 312 [52.413]

[52.8364]

[51.1624]

function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)

Deletion in edit.lua at line 314 [52.413]

B:BD[52.8364] → [9.3500:3573]

function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)

Solving an order conflict in edit.lua at line 314 [52.413]
[51.1724]
[53.5299]

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 222 [12.1]

Insertion in text.lua at line 222 [12.1]

Deletion in text.lua at line 224 [12.1]

Solving an order conflict in text.lua at line 224 [12.1]

Resurrecting zombie bytes in run.lua at line 280 [15.178044]

Deletion in run.lua at line 281 [15.178044]

Replacement in run.lua at line 708 [15.178044]

Deletion in run.lua at line 712 [15.178044]

Solving an order conflict in run.lua at line 712 [15.178044]

Replacement in run.lua at line 721 [15.178044]

Replacement in run.lua at line 737 [15.178044]

Replacement in run.lua at line 753 [15.178044]

Deletion in run.lua at line 761 [15.178044]

Solving an order conflict in run.lua at line 761 [15.178044]

Replacement in run.lua at line 763 [15.178044]

Deletion in run.lua at line 767 [15.178044]

Solving an order conflict in run.lua at line 767 [15.178044]

Replacement in run.lua at line 776 [15.178044]

Deletion in run.lua at line 782 [15.178044]

Solving an order conflict in run.lua at line 782 [15.178044]

Replacement in run.lua at line 896 [15.178044]

Deletion in run.lua at line 901 [15.178044]

Solving an order conflict in run.lua at line 901 [15.178044]

Replacement in run.lua at line 932 [15.178044]

Replacement in run.lua at line 946 [15.178044]

Replacement in run.lua at line 952 [15.178044]

Replacement in run.lua at line 961 [15.178044]

Replacement in run.lua at line 1250 [15.178044]

Replacement in run.lua at line 1264 [15.178044]

Replacement in run.lua at line 1270 [15.178044]

Replacement in run.lua at line 1275 [15.178044]

Replacement in run.lua at line 1291 [15.178044]

Replacement in run.lua at line 1327 [15.178044]

Replacement in run.lua at line 1397 [15.178044]

Deletion in run.lua at line 1626 [15.178044]

Solving an order conflict in run.lua at line 1626 [15.178044]

Replacement in main.lua at line 121 [29.2]

Replacement in main.lua at line 127 [29.2]

Replacement in main.lua at line 129 [29.2]

Deletion in main.lua at line 134 [29.2]

Solving an order conflict in main.lua at line 134 [29.2]

Deletion in main.lua at line 215 [29.2]

Resurrecting zombie bytes in main.lua at line 215 [29.2]

Solving an order conflict in main.lua at line 215 [29.2]

Resurrecting zombie bytes in main.lua at line 216 [29.2]

Resurrecting zombie bytes in main.lua at line 218 [29.2]

Resurrecting zombie bytes in main.lua at line 232 [29.2]

Resurrecting zombie bytes in main.lua at line 235 [29.2]

Resurrecting zombie bytes in main.lua at line 237 [29.2]

Resurrecting zombie bytes in main.lua at line 241 [29.2]

Resurrecting zombie bytes in main.lua at line 247 [29.2]

Resurrecting zombie bytes in main.lua at line 257 [29.2]

Replacement in main.lua at line 260 [29.2]

Replacement in main.lua at line 262 [29.2]

Deletion in main.lua at line 302 [29.2]

Resurrecting zombie bytes in main.lua at line 304 [29.2]

Resurrecting zombie bytes in main.lua at line 307 [29.2]

Resurrecting zombie bytes in main.lua at line 309 [29.2]

Deletion in main.lua at line 314 [29.2]

Resurrecting zombie bytes in main.lua at line 314 [29.2]

Solving an order conflict in main.lua at line 314 [29.2]

Resurrecting zombie bytes in main.lua at line 316 [29.2]

Resurrecting zombie bytes in main.lua at line 318 [29.2]

Resurrecting zombie bytes in main.lua at line 342 [29.2]

Resurrecting zombie bytes in edit.lua at line 312 [52.413]

Insertion in edit.lua at line 312 [52.413]

Deletion in edit.lua at line 314 [52.413]

Solving an order conflict in edit.lua at line 314 [52.413]