akkartik/sokoban.love - Change TBTKFVCEHHGHQ3JOZNLOT4PXUYMUGGM4C62KUP7N2KBHIEMXITPQC

resolve conflicts

Created by akkartik on March 13, 2024

TBTKFVCEHHGHQ3JOZNLOT4PXUYMUGGM4C62KUP7N2KBHIEMXITPQC

Dependencies

In channels

main

Change contents

Deletion in 0012-on.draw at line 15 [5.2899]
B:BD[4.2857] → [4.2857:2874]
```
		-- code editor
```
Deletion in 0012-on.draw at line 18 [5.2899]
B:BD[6.56] → [3.0:13]
BD:BD[6.56] → [3.0:13]
```
	draw_menu()
```
Resurrecting zombie bytes in 0012-on.draw at line 18 [5.2899]
B:B[7.8243] → [3.14:37]
BD:B[7.8243] → [3.14:37]
```
		draw_output_border()
```
Solving an order conflict in 0012-on.draw at line 18 [5.2899]
[4.2962]
Insertion in 0012-on.draw at line 18 [5.2899]
[0.169]
[3.14]
```
		draw_menu()
		-- output
```

Replacement in 0012-on.draw at line 21 [5.2899]

B:BD[3.37] → [3.37:247]

BD:BD[3.37] → [3.37:247]

		edit.draw(Current_pane.output_editor_state, Foreground_color, --[[hide cursor]] true)
		draw_scrollbar(Current_pane.output_editor_state)
		-- draw editor after menu and output scrollbar so search dialog over

[3.37]

[7.8243]

		edit.draw(Output_editor_state, Foreground_color, --[[hide cursor]] true)
		draw_scrollbar(Output_editor_state)
		-- code editor

Deletion in 0012-on.draw at line 27 [5.2899]
B:BD[7.8416] → [4.2963:2975]
BD:BD[7.8416] → [4.2963:2975]
B:BD[7.8439] → [8.1865:1978]
BD:BD[7.8439] → [8.1865:1978]
∅:D[8.1978] → [4.2976:3013]
B:BD[7.8574] → [4.2976:3013]
BD:BD[7.8574] → [4.2976:3013]
```
		-- output
		edit.draw(Output_editor_state, Foreground_color, --[[hide cursor]] true)
		draw_scrollbar(Output_editor_state)
		-- menu and debug UI
		draw_menu()
```
Resurrecting zombie bytes in 0012-on.draw at line 27 [5.2899]
∅:∅[4.3013] → [4.3013:3048]
B:B[4.3013] → [4.3013:3048]
BD:B[4.3013] → [4.3013:3048]
```
		draw_next_frames_of_animations()
```
Insertion in 0012-on.draw at line 27 [5.2899]
[7.8416]
[4.3013]
```
		--
```
Deletion in 0012-on.draw at line 32 [5.2899]
B:BD[9.2132] → [3.248:252]
BD:BD[9.2132] → [3.248:252]
```
end
```
Solving an order conflict in 0012-on.draw at line 32 [5.2899]
[2.682]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in 0012-on.draw at line 15 [5.2899]

Deletion in 0012-on.draw at line 18 [5.2899]

Resurrecting zombie bytes in 0012-on.draw at line 18 [5.2899]

Solving an order conflict in 0012-on.draw at line 18 [5.2899]

Insertion in 0012-on.draw at line 18 [5.2899]

Replacement in 0012-on.draw at line 21 [5.2899]

Deletion in 0012-on.draw at line 27 [5.2899]

Resurrecting zombie bytes in 0012-on.draw at line 27 [5.2899]

Insertion in 0012-on.draw at line 27 [5.2899]

Deletion in 0012-on.draw at line 32 [5.2899]

Solving an order conflict in 0012-on.draw at line 32 [5.2899]