akkartik/pothi.love - Change HABOI3J2GEQBHGMX74FOPDYOTRHSRICWJKNCOX2DOPF5ZB2XKD5QC

resolve conflicts

Created by akkartik on May 6, 2025

HABOI3J2GEQBHGMX74FOPDYOTRHSRICWJKNCOX2DOPF5ZB2XKD5QC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 279 [13.2]
B:BD[11.466] → [12.10:16]
```
  end
```
Solving an order conflict in main.lua at line 279 [13.2]
[14.889]
[12.16]
Deletion in main.lua at line 289 [13.2]
∅:D[5.161] → [15.11:11]
B:BD[16.779] → [15.11:11]
B:BD[14.889] → [9.422:422]
BD:BD[14.889] → [9.422:422]
Resurrecting zombie bytes in edit.lua at line 245 [18.413]
B:B[17.325] → [3.17:107]
BD:B[17.325] → [3.17:107]
```
  assert(State.cursor_x, 'tried to process key press when cursor is not within viewport')
```

Insertion in edit.lua at line 245 [18.413]

[19.5460]

[3.17]

function edit.keychord_press(State, chord, key, scancode, is_repeat, readonly)

Deletion in edit.lua at line 247 [18.413]

B:BD[19.5460] → [9.430:509]

function edit.keychord_press(State, chord, key, scancode, is_repeat, readonly)

Solving an order conflict in edit.lua at line 247 [18.413]
[3.107]
[17.325]
Replacement in 0132-on.resize at line 1 [20.39]
B:BD[20.39] → [20.40:67]
```
on.resize = function(w, h)
```
[20.39]
[8.246]
```
on.resize = function(w,h)
```
Insertion in 0023-on.keychord_press at line 1 [21.26]
[21.26]
[22.132]
```
on.keychord_press = function(chord, key, scancode, is_repeat)
```
Deletion in 0023-on.keychord_press at line 9 [21.26]
B:BD[21.26] → [10.66:128]
BD:BD[21.26] → [10.66:128]
```
on.keychord_press = function(chord, key, scancode, is_repeat)
```
Solving an order conflict in 0023-on.keychord_press at line 9 [21.26]
[24.2918]
[21.92]

Replacement in 0023-on.keychord_press at line 32 [21.26]

B:BD[22.571] → [22.571:622]

		keychord_press_on_manifest_navigator(chord, key)

[22.571]

[22.622]

		keychord_press_on_manifest_navigator(chord, key, scancode, is_repeat)

Replacement in 0023-on.keychord_press at line 53 [21.26]
∅:D[26.236] → [27.967:1022]
∅:D[28.281] → [27.967:1022]
∅:D[29.488] → [27.967:1022]
B:BD[27.967] → [27.967:1022]
```
			edit.keychord_press(Cursor_node.editor, chord, key)
```
[26.236]
[25.701]
```
			edit.keychord_press(Cursor_node.editor, chord, key, scancode, is_repeat)
```
Deletion in 0023-on.keychord_press at line 66 [21.26]
B:BD[22.1350] → [29.629:629]
B:BD[30.95] → [10.129:204]
BD:BD[30.95] → [10.129:204]
BD:BD[30.95] → [10.129:204]
```
		edit.keychord_press(Cursor_node.editor, chord, key, scancode, is_repeat)
```
Solving an order conflict in 0023-on.keychord_press at line 66 [21.26]
[22.1350]
[21.695]
Deletion in 0023-on.keychord_press at line 100 [21.26]
B:BD[21.1610] → [10.205:208]
```
end
```
Solving an order conflict in 0023-on.keychord_press at line 100 [21.26]
[4.132]

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

B:BD[31.1417] → [32.59280:59327]

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

[31.1417]

[2.126]

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

Replacement in 0017-on.mouse_release at line 20 [31.1417]

B:BD[31.1549] → [33.554:614]

		edit.mouse_release(Cursor_node.editor, x,y, mouse_button)

[31.1549]

[31.1610]

		edit.mouse_release(Cursor_node.editor, x,y, mouse_button, is_touch, presses)

Deletion in 0017-on.mouse_release at line 22 [31.1417]
B:BD[31.1615] → [2.194:197]
```
end
```
Insertion in 0006-on.mouse_press at line 1 [31.703]
[31.703]
[22.13149]
```
on.mouse_press = function(x,y, mouse_button, is_touch, presses)
```
Deletion in 0006-on.mouse_press at line 6 [31.703]
B:BD[31.703] → [10.232:296]
BD:BD[31.703] → [10.232:296]
```
on.mouse_press = function(x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in 0006-on.mouse_press at line 6 [31.703]
[22.13198]
[31.751]
Resurrecting zombie bytes in 0006-on.mouse_press at line 18 [31.703]
∅:∅[23.389] → [22.13347:13419]
B:B[34.429] → [22.13347:13419]
BD:B[34.429] → [22.13347:13419]
```
		return
	end
	local node = on_handle(x,y)
	if node then
		-- move node
```

Insertion in 0006-on.mouse_press at line 18 [31.703]

[31.891]

[22.13347]

		edit.mouse_press(node.editor, x,y, mouse_button, is_touch, presses)

Resurrecting zombie bytes in 0006-on.mouse_press at line 26 [31.703]
∅:∅[6.1293] → [22.13502:13511]
B:B[22.13502] → [22.13502:13511]
BD:B[22.13502] → [22.13502:13511]
```
		return
```
Deletion in 0006-on.mouse_press at line 27 [31.703]
B:BD[22.13511] → [23.391:391]
B:BD[35.78] → [10.297:367]
BD:BD[35.78] → [10.297:367]
BD:BD[35.78] → [10.297:367]
```
		edit.mouse_press(node.editor, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in 0006-on.mouse_press at line 27 [31.703]
[22.13511]
[31.990]
Deletion in 0006-on.mouse_press at line 30 [31.703]
B:BD[25.1262] → [6.1294:1297]
```
end
```
Resurrecting zombie bytes in 0006-on.mouse_press at line 30 [31.703]
B:B[36.123] → [10.368:371]
BD:B[36.123] → [10.368:371]
```
end
```
Solving an order conflict in 0006-on.mouse_press at line 30 [31.703]
[25.1262]
[10.368]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 279 [13.2]

Solving an order conflict in main.lua at line 279 [13.2]

Deletion in main.lua at line 289 [13.2]

Resurrecting zombie bytes in edit.lua at line 245 [18.413]

Insertion in edit.lua at line 245 [18.413]

Deletion in edit.lua at line 247 [18.413]

Solving an order conflict in edit.lua at line 247 [18.413]

Replacement in 0132-on.resize at line 1 [20.39]

Insertion in 0023-on.keychord_press at line 1 [21.26]

Deletion in 0023-on.keychord_press at line 9 [21.26]

Solving an order conflict in 0023-on.keychord_press at line 9 [21.26]

Replacement in 0023-on.keychord_press at line 32 [21.26]

Replacement in 0023-on.keychord_press at line 53 [21.26]

Deletion in 0023-on.keychord_press at line 66 [21.26]

Solving an order conflict in 0023-on.keychord_press at line 66 [21.26]

Deletion in 0023-on.keychord_press at line 100 [21.26]

Solving an order conflict in 0023-on.keychord_press at line 100 [21.26]

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

Replacement in 0017-on.mouse_release at line 20 [31.1417]

Deletion in 0017-on.mouse_release at line 22 [31.1417]

Insertion in 0006-on.mouse_press at line 1 [31.703]

Deletion in 0006-on.mouse_press at line 6 [31.703]

Solving an order conflict in 0006-on.mouse_press at line 6 [31.703]

Resurrecting zombie bytes in 0006-on.mouse_press at line 18 [31.703]

Insertion in 0006-on.mouse_press at line 18 [31.703]

Resurrecting zombie bytes in 0006-on.mouse_press at line 26 [31.703]

Deletion in 0006-on.mouse_press at line 27 [31.703]

Solving an order conflict in 0006-on.mouse_press at line 27 [31.703]

Deletion in 0006-on.mouse_press at line 30 [31.703]

Resurrecting zombie bytes in 0006-on.mouse_press at line 30 [31.703]

Solving an order conflict in 0006-on.mouse_press at line 30 [31.703]