akkartik/sokoban.love - Change FR52VE6BMKVWZW7TUDOV3WM22M3C52UQP2V6VQM5R5GC2NVDZGMQC

resolve conflicts

Created by akkartik on May 6, 2025

FR52VE6BMKVWZW7TUDOV3WM22M3C52UQP2V6VQM5R5GC2NVDZGMQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in 0017-on.mouse_release at line 1 [4.2211]
B:B[4.2259] → [5.463:514]
BD:B[4.2259] → [5.463:514]
```
	if not Show_code then
		if car.mouse_release then
```

Insertion in 0017-on.mouse_release at line 1 [4.2211]

[4.2211]

[5.463]

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

Replacement in 0017-on.mouse_release at line 4 [4.2211]

B:BD[5.514] → [5.514:570]

BD:BD[5.514] → [5.514:570]

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

[5.514]

[5.570]

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

Replacement in 0017-on.mouse_release at line 7 [4.2211]

B:BD[5.604] → [5.604:660]

BD:BD[5.604] → [5.604:660]

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

[5.604]

[5.660]

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

Deletion in 0017-on.mouse_release at line 13 [4.2211]
B:BD[4.2211] → [3.666:732]
BD:BD[4.2211] → [3.666:732]
```
on.mouse_release = function(x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in 0017-on.mouse_release at line 13 [4.2211]
[5.739]
[6.66]

Resurrecting zombie bytes in 0017-on.mouse_release at line 30 [4.2211]

B:B[7.848] → [8.1281:1573]

BD:B[7.848] → [8.1281:1573]

		elseif Output_editor_state.scrollbar_drag then
			adjust_scrollbar(Output_editor_state, y)
			Output_editor_state.scrollbar_drag = nil
			Output_editor_state.scrollbar_offset = nil
		elseif on_editor_scrollbar_area(Output_editor_state, x,y) then
			adjust_scrollbar(Output_editor_state, y)

Insertion in 0017-on.mouse_release at line 30 [4.2211]

[7.780]

[8.1281]

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

Deletion in 0017-on.mouse_release at line 37 [4.2211]
B:BD[7.780] → [3.733:820]
BD:BD[7.780] → [3.733:820]
```
			edit.mouse_release(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in 0017-on.mouse_release at line 37 [4.2211]
[8.1573]
[7.1159]
Deletion in 0017-on.mouse_release at line 38 [4.2211]
B:BD[9.1222] → [3.821:896]
BD:BD[9.1222] → [3.821:896]
B:BD[9.1312] → [3.897:972]
BD:BD[9.1312] → [3.897:972]
```
			call_protected(car.mouse_release, x,y, mouse_button, is_touch, presses)
			call_protected(car.mousereleased, x,y, mouse_button, is_touch, presses)
```
Resurrecting zombie bytes in 0016-on.mouse_press at line 1 [4.2363]
B:B[4.2409] → [5.921:970]
BD:B[4.2409] → [5.921:970]
```
	if not Show_code then
		if car.mouse_press then
```

Insertion in 0016-on.mouse_press at line 1 [4.2363]

[4.2363]

[5.921]

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

Replacement in 0016-on.mouse_press at line 4 [4.2363]

B:BD[5.970] → [5.970:1024]

BD:BD[5.970] → [5.970:1024]

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

[5.970]

[5.1024]

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

Replacement in 0016-on.mouse_press at line 7 [4.2363]

B:BD[5.1057] → [5.1057:1112]

BD:BD[5.1057] → [5.1057:1112]

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

[5.1057]

[5.1112]

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

Deletion in 0016-on.mouse_press at line 31 [4.2363]
B:BD[4.2363] → [3.974:1038]
BD:BD[4.2363] → [3.974:1038]
```
on.mouse_press = function(x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in 0016-on.mouse_press at line 31 [4.2363]
[5.1854]
[10.166]

Resurrecting zombie bytes in 0016-on.mouse_press at line 42 [4.2363]

B:B[7.1762] → [8.1575:1860]

BD:B[7.1762] → [8.1575:1860]

		elseif on_editor_scrollbar(Output_editor_state, x,y) then
			Output_editor_state.scrollbar_drag = true
			local sbtopy = compute_scrollbar_topy(Output_editor_state)
			Output_editor_state.scrollbar_offset = y - sbtopy
		elseif on_editor_scrollbar_area(Output_editor_state, x,y) then

Insertion in 0016-on.mouse_press at line 42 [4.2363]

[7.1696]

[8.1575]

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

Deletion in 0016-on.mouse_press at line 48 [4.2363]
B:BD[7.1696] → [3.1039:1124]
BD:BD[7.1696] → [3.1039:1124]
```
			edit.mouse_press(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in 0016-on.mouse_press at line 48 [4.2363]
[8.1860]
[7.1971]
Deletion in 0016-on.mouse_press at line 49 [4.2363]
B:BD[11.167] → [3.1125:1198]
BD:BD[11.167] → [3.1125:1198]
B:BD[11.254] → [3.1199:1273]
BD:BD[11.254] → [3.1199:1273]
```
			call_protected(car.mouse_press, x,y, mouse_button, is_touch, presses)
			call_protected(car.mousepressed, x,y, mouse_button, is_touch, presses)
```
Deletion in 0016-on.mouse_press at line 52 [4.2363]
B:BD[12.1606] → [3.1274:1277]
```
end
```
Solving an order conflict in 0016-on.mouse_press at line 52 [4.2363]
[5.1895]

Resurrecting zombie bytes in 0013-on.keychord_press at line 1 [4.2758]

B:B[4.2800] → [5.2027:2375]

BD:B[4.2800] → [5.2027:2375]

	if Show_code then
		if Show_file_dialog then
			keychord_press_on_file_dialog(chord, key)
			return
		end
		if chord == 'C-=' then
			update_font_settings(Current_pane.editor_state.font_height+2)
		elseif chord == 'C--' then
			update_font_settings(Current_pane.editor_state.font_height-2)
		elseif chord == 'C-0' then
			update_font_settings(20)

Insertion in 0013-on.keychord_press at line 1 [4.2758]
[4.2758]
[5.2027]
```
on.keychord_press = function(chord, key, scancode, is_repeat)
```
Deletion in 0013-on.keychord_press at line 14 [4.2758]
B:BD[4.2758] → [3.1281:1343]
BD:BD[4.2758] → [3.1281:1343]
```
on.keychord_press = function(chord, key, scancode, is_repeat)
```
Solving an order conflict in 0013-on.keychord_press at line 14 [4.2758]
[2.271]
[13.3580]
Deletion in 0013-on.keychord_press at line 22 [4.2758]
B:BD[2.319] → [2.319:381]
```
			edit.keychord_press(Current_pane.editor_state, chord, key)
```
Resurrecting zombie bytes in 0013-on.keychord_press at line 22 [4.2758]
B:B[7.2784] → [3.1344:1427]
BD:B[7.2784] → [3.1344:1427]
```
			edit.keychord_press(Current_pane.editor_state, chord, key, scancode, is_repeat)
```
Solving an order conflict in 0013-on.keychord_press at line 22 [4.2758]
[2.319]
[3.1344]
Resurrecting zombie bytes in 0013-on.keychord_press at line 25 [4.2758]
B:B[7.2858] → [2.553:633]
BD:B[7.2858] → [2.553:633]
```
		if chord == 'f3' then
			press_show_button()
		elseif car.keychord_press then
```
Resurrecting zombie bytes in 0013-on.keychord_press at line 28 [4.2758]
B:B[9.1704] → [3.1428:1499]
BD:B[9.1704] → [3.1428:1499]
```
			call_protected(car.keychord_press, chord, key, scancode, is_repeat)
```
Solving an order conflict in 0013-on.keychord_press at line 28 [4.2758]
[2.633]
[3.1428]
Replacement in 0013-on.keychord_press at line 34 [4.2758]
B:BD[14.2303] → [2.634:638]
```
end
```
[14.2303]
```
end
```

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in 0017-on.mouse_release at line 1 [4.2211]

Insertion in 0017-on.mouse_release at line 1 [4.2211]

Replacement in 0017-on.mouse_release at line 4 [4.2211]

Replacement in 0017-on.mouse_release at line 7 [4.2211]

Deletion in 0017-on.mouse_release at line 13 [4.2211]

Solving an order conflict in 0017-on.mouse_release at line 13 [4.2211]

Resurrecting zombie bytes in 0017-on.mouse_release at line 30 [4.2211]

Insertion in 0017-on.mouse_release at line 30 [4.2211]

Deletion in 0017-on.mouse_release at line 37 [4.2211]

Solving an order conflict in 0017-on.mouse_release at line 37 [4.2211]

Deletion in 0017-on.mouse_release at line 38 [4.2211]

Resurrecting zombie bytes in 0016-on.mouse_press at line 1 [4.2363]

Insertion in 0016-on.mouse_press at line 1 [4.2363]

Replacement in 0016-on.mouse_press at line 4 [4.2363]

Replacement in 0016-on.mouse_press at line 7 [4.2363]

Deletion in 0016-on.mouse_press at line 31 [4.2363]

Solving an order conflict in 0016-on.mouse_press at line 31 [4.2363]

Resurrecting zombie bytes in 0016-on.mouse_press at line 42 [4.2363]

Insertion in 0016-on.mouse_press at line 42 [4.2363]

Deletion in 0016-on.mouse_press at line 48 [4.2363]

Solving an order conflict in 0016-on.mouse_press at line 48 [4.2363]

Deletion in 0016-on.mouse_press at line 49 [4.2363]

Deletion in 0016-on.mouse_press at line 52 [4.2363]

Solving an order conflict in 0016-on.mouse_press at line 52 [4.2363]

Resurrecting zombie bytes in 0013-on.keychord_press at line 1 [4.2758]

Insertion in 0013-on.keychord_press at line 1 [4.2758]

Deletion in 0013-on.keychord_press at line 14 [4.2758]

Solving an order conflict in 0013-on.keychord_press at line 14 [4.2758]

Deletion in 0013-on.keychord_press at line 22 [4.2758]

Resurrecting zombie bytes in 0013-on.keychord_press at line 22 [4.2758]

Solving an order conflict in 0013-on.keychord_press at line 22 [4.2758]

Resurrecting zombie bytes in 0013-on.keychord_press at line 25 [4.2758]

Resurrecting zombie bytes in 0013-on.keychord_press at line 28 [4.2758]

Solving an order conflict in 0013-on.keychord_press at line 28 [4.2758]

Replacement in 0013-on.keychord_press at line 34 [4.2758]