akkartik/sokoban.love - Change EZ7I57M2W4CFSENSIGLKY4FIM7U7FDXVRHUSOHBIKFFAB5SEBEGAC

resolve conflicts

Created by akkartik on May 6, 2025

EZ7I57M2W4CFSENSIGLKY4FIM7U7FDXVRHUSOHBIKFFAB5SEBEGAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 165 [9.2]
∅:D[7.935] → [8.5112:5138]
B:BD[8.5112] → [8.5112:5138]
```
function App.resize(w, h)
```
[7.935]
[8.5138]
```
function App.resize(w,h)
```
Resurrecting zombie bytes in main.lua at line 195 [9.2]
B:B[10.181] → [11.572:577]
BD:B[10.181] → [11.572:577]
```
end
```

Insertion in main.lua at line 195 [9.2]

[8.7080]

[11.572]

  if on.mouse_release then on.mouse_release(x,y, mouse_button, is_touch, presses) end

Deletion in main.lua at line 198 [9.2]

B:BD[11.577] → [11.577:685]

BD:BD[11.577] → [11.577:685]

B:BD[11.685] → [3.14:14]

B:BD[8.7080] → [6.246:332]

function App.mousemoved(x,y, dx,dy, istouch)
  if on.mouse_move then on.mouse_move(x,y, dx,dy, istouch) end
  if on.mouse_release then on.mouse_release(x,y, mouse_button, is_touch, presses) end

Solving an order conflict in main.lua at line 198 [9.2]
[11.577]

Insertion in main.lua at line 198 [9.2]

[0.125]

[12.310]

function App.mousemoved(x,y, dx,dy, is_touch)
  if on.mouse_move then on.mouse_move(x,y, dx,dy, is_touch) end

Deletion in main.lua at line 280 [9.2]
B:BD[13.155] → [6.424:424]
B:BD[12.423] → [6.334:334]
BD:BD[12.423] → [6.334:334]
Solving an order conflict in main.lua at line 280 [9.2]
[13.155]

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

B:B[14.610] → [15.7329:7548]

BD:B[14.610] → [15.7329:7548]

  end
end
function Text.insert_text(State, d)
  for _,code in utf8.codes(d) do
    local c = utf8.char(code)
    if c == '\n' then
      Text.insert_return(State)
    else
      Text.insert_at_cursor(State, c)
    end

Insertion in edit.lua at line 381 [16.413]

[17.10211]

[15.7329]

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

Deletion in edit.lua at line 393 [16.413]

B:BD[17.10211] → [6.512:586]

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

Solving an order conflict in edit.lua at line 393 [16.413]
[15.7548]
[17.10356]

Replacement in 0154-on.mouse_move at line 1 [11.1]

B:BD[11.1] → [11.2:48]

on.mouse_move = function(x,y, dx,dy, istouch)

[11.1]

[5.60]

on.mouse_move = function(x,y, dx,dy, is_touch)

Replacement in 0154-on.mouse_move at line 4 [11.1]

B:BD[5.108] → [5.108:163]

			call_protected(car.mousemoved, x,y, dx,dy, istouch)

[5.108]

[5.163]

			call_protected(car.mousemoved, x,y, dx,dy, is_touch)

Replacement in 0154-on.mouse_move at line 7 [11.1]

B:BD[5.194] → [5.194:249]

			call_protected(car.mouse_move, x,y, dx,dy, istouch)

[5.194]

[5.249]

			call_protected(car.mouse_move, x,y, dx,dy, is_touch)

Replacement in 0031-on.resize at line 1 [18.1]
B:BD[18.1] → [4.135:162]
```
on.resize = function(w, h)
```
[18.1]
[18.25]
```
on.resize = function(w,h)
```

Replacement in 0017-on.mouse_release at line 1 [19.2211]

B:BD[19.2211] → [19.2212:2259]

on.mouse_release = function(x,y, mouse_button)

[19.2211]

[20.66]

on.mouse_release = function(x,y, mouse_button, is_touch, presses)

Replacement in 0017-on.mouse_release at line 23 [19.2211]

B:BD[21.780] → [21.780:848]

			edit.mouse_release(Current_pane.editor_state, x,y, mouse_button)

[21.780]

[21.848]

			edit.mouse_release(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)

Replacement in 0017-on.mouse_release at line 34 [19.2211]

B:BD[22.1222] → [22.1222:1278]

			call_protected(car.mouse_release, x,y, mouse_button)

[22.1222]

[22.1278]

			call_protected(car.mouse_release, x,y, mouse_button, is_touch, presses)

Replacement in 0017-on.mouse_release at line 37 [19.2211]

B:BD[22.1312] → [22.1312:1368]

			call_protected(car.mousereleased, x,y, mouse_button)

[22.1312]

[22.1368]

			call_protected(car.mousereleased, x,y, mouse_button, is_touch, presses)

Replacement in 0016-on.mouse_press at line 1 [19.2363]

B:BD[19.2363] → [19.2364:2409]

on.mouse_press = function(x,y, mouse_button)

[19.2363]

[20.240]

on.mouse_press = function(x,y, mouse_button, is_touch, presses)

Replacement in 0016-on.mouse_press at line 35 [19.2363]

B:BD[21.1696] → [21.1696:1762]

			edit.mouse_press(Current_pane.editor_state, x,y, mouse_button)

[21.1696]

[21.1762]

			edit.mouse_press(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)

Replacement in 0016-on.mouse_press at line 46 [19.2363]

B:BD[23.167] → [23.167:221]

			call_protected(car.mouse_press, x,y, mouse_button)

[23.167]

[23.221]

			call_protected(car.mouse_press, x,y, mouse_button, is_touch, presses)

Replacement in 0016-on.mouse_press at line 49 [19.2363]

B:BD[23.254] → [23.254:309]

			call_protected(car.mousepressed, x,y, mouse_button)

[23.254]

[23.309]

			call_protected(car.mousepressed, x,y, mouse_button, is_touch, presses)

Replacement in 0016-on.mouse_press at line 52 [19.2363]
B:BD[24.1606] → [2.216:220]
```
end
```
[24.1606]
```
end
```
Replacement in 0013-on.keychord_press at line 1 [19.2758]
B:BD[19.2758] → [19.2759:2800]
```
on.keychord_press = function(chord, key)
```
[19.2758]
[25.4016]
```
on.keychord_press = function(chord, key, scancode, is_repeat)
```

Replacement in 0013-on.keychord_press at line 24 [19.2758]

B:BD[21.2784] → [21.2784:2846]

			edit.keychord_press(Current_pane.editor_state, chord, key)

[21.2784]

[21.2846]

			edit.keychord_press(Current_pane.editor_state, chord, key, scancode, is_repeat)

Replacement in 0013-on.keychord_press at line 29 [19.2758]

B:BD[22.1704] → [22.1704:1754]

			call_protected(car.keychord_press, chord, key)

[22.1704]

[22.1754]

			call_protected(car.keychord_press, chord, key, scancode, is_repeat)

Replacement in 0013-on.keychord_press at line 32 [19.2758]
B:BD[22.1785] → [22.1785:1824]
```
			call_protected(car.keypressed, key)
```
[22.1785]
[22.1824]
```
			call_protected(car.keypressed, key, scancode, is_repeat)
```

resolve conflicts

Dependencies

In channels

Change contents

Replacement in main.lua at line 165 [9.2]

Resurrecting zombie bytes in main.lua at line 195 [9.2]