akkartik/sokoban.love - Change G6WO7RL4BBE6YAFUPPNVT34YWZNLD7NVJQTO75DW7SVHJTY4FEDQC

resolve conflicts

Created by akkartik on February 25, 2024

G6WO7RL4BBE6YAFUPPNVT34YWZNLD7NVJQTO75DW7SVHJTY4FEDQC

Dependencies

In channels

main

Change contents

File deletion: 0106-stop_button, 0106-stop_button
BFD:BFD[4.2] → [5.0:40]
BFD:BFD[4.2] → [5.0:40]
BFD:BFD[5.40] → [5.41:41]
B:BD[6.1469] → [7.3103:3106]
B:BD[6.1362] → [3.1489:1574]
∅:D[3.1574] → [8.760:796]
∅:D[7.3102] → [8.760:796]
```
end
	styled_button('stop', x,y, press_stop_button, not Is_mobile and Show_code and 'F2')
	local w = Font:getWidth('stop')+10
```
File deletion: 0065-hide_code_button, 0065-hide_code_button
BFD:BFD[4.2] → [9.5120:5165]
BFD:BFD[4.2] → [9.5120:5165]
BFD:BFD[9.5165] → [9.4728:4728]
B:BD[6.3098] → [3.1575:1668]
∅:D[3.1668] → [7.3203:3206]
B:BD[7.3203] → [7.3203:3206]
```
	return overflowable_button('hide', x, y, r, press_hide_button, nil, not Is_mobile and 'F3')
end
```
File deletion: 0064-show_code_button, 0064-show_code_button
BFD:BFD[4.2] → [9.5558:5603]
BFD:BFD[4.2] → [9.5558:5603]
BFD:BFD[9.5603] → [9.5167:5167]
B:BD[11.109] → [3.1669:1762]
∅:D[3.1762] → [7.3272:3275]
B:BD[7.3272] → [7.3272:3275]
```
	return overflowable_button('show', x, y, r, press_show_button, nil, not Is_mobile and 'F3')
end
```
Deletion in 0168-press_previous_pane_button at line 4 [7.1]
∅:D[3.943] → [7.59:83]
B:BD[7.59] → [7.59:83]
```
	Current_pane.car = car
```
Replacement in 0168-press_previous_pane_button at line 6 [7.1]
B:BD[7.168] → [7.168:201]
```
	car = Current_pane.car or {}
end
```
[7.168]
```
end
```
Deletion in 0167-press_next_pane_button at line 4 [7.259]
∅:D[3.993] → [7.313:337]
B:BD[7.313] → [7.313:337]
```
	Current_pane.car = car
```
Replacement in 0167-press_next_pane_button at line 6 [7.259]
B:BD[7.422] → [7.422:455]
```
	car = Current_pane.car or {}
end
```
[7.422]
```
end
```

Replacement in 0161-press_run_button at line 3 [7.1944]

B:BD[7.1992] → [7.1992:2866]

	-- ## run: initialize
	clear_handlers()
	local buf = table.concat(map(Current_pane.editor_state.lines, function(line) return line.data end), '\n')
	Current_pane.canvas = love.graphics.newCanvas()
	love.graphics.setCanvas(Current_pane.canvas)
	love.graphics.push('all')
	love.graphics.setBackgroundColor(1,1,1)
	edit.clear(Current_pane.output_editor_state)
	print = print_to_output
	-- ## run
	local status, result = live.eval(buf, 'editor')
	-- ## run: save some stuff, clean up the rest
	print = Real_print
	if result then
		-- could be either output or error
		table.insert(Current_pane.output_editor_state.lines, {data=tostring(result)})
	end
	if #Current_pane.output_editor_state.lines == 0 then
		table.insert(Current_pane.output_editor_state.lines, {data=''})
	end
	Text.redraw_all(Current_pane.output_editor_state)
	love.graphics.pop()
	love.graphics.setCanvas()
end

[7.1992]

	run_app()
end

Replacement in 0060-next_pane_button at line 13 [9.6220]
B:BD[9.6672] → [12.757:760]
B:BD[9.6672] → [7.3317:3320]
```
end
end
```
[9.6672]
```
end
```
Replacement in 0059-previous_pane_button at line 12 [9.6723]
B:BD[9.7215] → [12.761:764]
B:BD[9.7215] → [7.3364:3367]
```
end
end
```
[9.7215]
```
end
```
Deletion in 0051-run_button at line 2 [15.1]
B:BD[13.616] → [14.1829:1842]
BD:BD[13.616] → [14.1829:1842]
```
			run_app()
```
Replacement in 0051-run_button at line 5 [15.1]
B:BD[6.4086] → [7.3419:3422]
```
end
```
[6.4086]
```
end
```

Deletion in 0013-on.keychord_press at line 13 [16.2758]

B:BD[10.2375] → [10.2375:2546]

B:BD[17.2244] → [7.3455:3522]

BD:BD[17.2244] → [7.3455:3522]

B:BD[18.2692] → [7.3523:3580]

BD:BD[18.2692] → [7.3523:3580]

		else
			if Current_pane.editor_state.cursor_x then
				-- send keys to editor if cursor is visible
				edit.keychord_press(Current_pane.editor_state, chord, key)
			end
	elseif not Show_code and chord == 'f3' then
		press_show_button()
		if chord == 'C-left' then press_previous_pane_button()

Resurrecting zombie bytes in 0013-on.keychord_press at line 13 [16.2758]

B:B[7.3580] → [7.3580:3926]

BD:B[7.3580] → [7.3580:3926]

		elseif chord == 'C-right' then press_next_pane_button()
		elseif chord == 'f1' then press_run_button()
		elseif chord == 'f2' then press_stop_button()
		elseif chord == 'f3' then press_hide_button()
		elseif chord == 'f4' then press_save_button()
		elseif chord == 'f5' then press_load_button()
		elseif Current_pane.editor_state.cursor_x then

Solving an order conflict in 0013-on.keychord_press at line 13 [16.2758]
[10.2375]
Insertion in 0013-on.keychord_press at line 13 [16.2758]
[0.209]
[7.3580]
```
		elseif chord == 'C-left' then press_previous_pane_button()
```

Insertion in 0013-on.keychord_press at line 21 [16.2758]

[7.3926]

[18.2846]

			-- send keys to editor if cursor is visible
			edit.keychord_press(Current_pane.editor_state, chord, key)
		else
			if Current_pane.editor_state.cursor_x then
				-- send keys to editor if cursor is visible
				edit.keychord_press(Current_pane.editor_state, chord, key)
			end

Replacement in 0013-on.keychord_press at line 30 [16.2758]

B:BD[18.2878] → [19.1675:1704]

		if car.keychord_press then

[18.2858]

[19.1704]

		if chord == 'f3' then
			press_show_button()
		elseif car.keychord_press then

Replacement in 0013-on.keychord_press at line 39 [16.2758]
B:BD[17.2303] → [20.4074:4077]
```
end
```
[17.2303]
```
end
```
Insertion in 0012-on.draw at line 29 [16.2899]
[10.3048]
[9.8574]
```
		draw_button_tooltips(Global_state)
```
Replacement in 0012-on.draw at line 31 [16.2899]
B:BD[21.2223] → [3.2096:2132]
BD:BD[21.2223] → [3.2096:2132]
∅:D[3.2132] → [22.146:149]
B:BD[21.2223] → [22.146:149]
```
	draw_button_tooltips(Global_state)
end
```
[9.8579]
```
end
```

resolve conflicts

Dependencies

In channels

Change contents

File deletion: 0106-stop_button, 0106-stop_button

File deletion: 0065-hide_code_button, 0065-hide_code_button

File deletion: 0064-show_code_button, 0064-show_code_button

Deletion in 0168-press_previous_pane_button at line 4 [7.1]

Replacement in 0168-press_previous_pane_button at line 6 [7.1]

Deletion in 0167-press_next_pane_button at line 4 [7.259]

Replacement in 0167-press_next_pane_button at line 6 [7.259]

Replacement in 0161-press_run_button at line 3 [7.1944]

Replacement in 0060-next_pane_button at line 13 [9.6220]

Replacement in 0059-previous_pane_button at line 12 [9.6723]

Deletion in 0051-run_button at line 2 [15.1]

Replacement in 0051-run_button at line 5 [15.1]

Deletion in 0013-on.keychord_press at line 13 [16.2758]

Resurrecting zombie bytes in 0013-on.keychord_press at line 13 [16.2758]

Solving an order conflict in 0013-on.keychord_press at line 13 [16.2758]

Insertion in 0013-on.keychord_press at line 13 [16.2758]

Insertion in 0013-on.keychord_press at line 21 [16.2758]

Replacement in 0013-on.keychord_press at line 30 [16.2758]

Replacement in 0013-on.keychord_press at line 39 [16.2758]

Insertion in 0012-on.draw at line 29 [16.2899]

Replacement in 0012-on.draw at line 31 [16.2899]