akkartik/pothi.love - Change GMJOEWFE6ZBKB5T2Y3AMDKIAJEN7WA7SSHJNZZXQ7TJXDCQYCSGQC

resolve conflicts

Created by akkartik on March 19, 2025

GMJOEWFE6ZBKB5T2Y3AMDKIAJEN7WA7SSHJNZZXQ7TJXDCQYCSGQC

Dependencies

In channels

main

Change contents

Replacement in 0026-on.draw at line 17 [6.238692]
B:BD[5.2539] → [5.2539:2563]
```
			if obj.w == nil then
```
[5.2539]
[5.2563]
```
			if obj.width == nil then
```
Deletion in 0026-on.draw at line 23 [6.238692]
B:BD[5.2694] → [2.94:94]
B:BD[6.240278] → [7.0:28]
BD:BD[6.240278] → [7.0:28]
BD:BD[6.240278] → [7.0:28]
```
			if obj.width == nil then
```
Solving an order conflict in 0026-on.draw at line 23 [6.238692]
[5.2694]
[6.241393]
Deletion in 0010-initialize_editor at line 2 [10.542]
B:BD[10.628] → [11.1089:1185]
BD:BD[10.628] → [11.1089:1185]
B:BD[11.1185] → [13.107:285]
BD:BD[11.1185] → [13.107:285]
∅:D[13.285] → [14.526:563]
B:BD[15.25394] → [14.526:563]
∅:D[14.563] → [16.877:907]
B:BD[15.25394] → [16.877:907]
BD:BD[14.563] → [16.877:907]
BD:BD[15.25394] → [16.877:907]
B:BD[16.907] → [3.176:176]
BD:BD[16.907] → [3.176:176]
B:BD[10.936] → [17.1258:1261]
BD:BD[10.936] → [17.1258:1261]
B:BD[17.1261] → [8.1262:1262]
B:BD[8.1262] → [13.287:287]
```
		local scaled_fontsize = scale(20)
		local scaled_lineheight = math.floor(scaled_fontsize*1.3)
		obj.editor = edit.initialize_state(Menu_bar_height + vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), love.graphics.getFont(), scaled_fontsize, scaled_lineheight)
		obj.editor.filename = obj.filename
		obj.editor.lines = obj.data
end
```
Deletion in 0010-initialize_editor at line 5 [10.542]
B:BD[7.368] → [12.156:210]
```
	-- HACK: modify obj.editor.left after initialization
```

Replacement in 0010-initialize_editor at line 6 [10.542]

B:BD[12.387] → [12.387:527]

∅:D[12.527] → [7.527:568]

B:BD[7.527] → [7.527:568]

	obj.editor.left = obj.editor.left + Line_number_width*obj.editor.font:getWidth('m')
	obj.editor.width = obj.editor.right - obj.editor.left
	obj.editor.lines = load_array(obj.data)

[12.387]

[7.568]

	obj.editor.filename = obj.filename
	obj.editor.lines = obj.data

Resurrecting zombie bytes in 0010-initialize_editor at line 9 [10.542]
B:B[7.597] → [12.528:531]
BD:B[7.597] → [12.528:531]
```
end
```
Deletion in 0007-on_text at line 3 [18.25]
B:BD[18.84] → [14.567:617]
B:BD[14.617] → [8.1269:1269]
B:BD[18.84] → [7.598:643]
```
		if node.type == 'text' and not node.button then
		if node.type == 'text' and node.width then
```
Resurrecting zombie bytes in 0007-on_text at line 3 [18.25]
∅:∅[7.643] → [19.5733:5866]
∅:∅[8.1269] → [19.5733:5866]
B:B[18.114] → [19.5733:5866]
BD:B[18.114] → [19.5733:5866]
```
			if x >= vx(node.x) and node.w and x < vx(node.x + node.w) then
				if y >= vy(node.y) and node.h and y < vy(node.y + node.h) then
```

Insertion in 0007-on_text at line 3 [18.25]

[18.84]

[19.5733]

		if node.type == 'text' and node.width and not node.button then

resolve conflicts

Dependencies

In channels

Change contents

Replacement in 0026-on.draw at line 17 [6.238692]

Deletion in 0026-on.draw at line 23 [6.238692]

Solving an order conflict in 0026-on.draw at line 23 [6.238692]

Deletion in 0010-initialize_editor at line 2 [10.542]

Deletion in 0010-initialize_editor at line 5 [10.542]

Replacement in 0010-initialize_editor at line 6 [10.542]

Resurrecting zombie bytes in 0010-initialize_editor at line 9 [10.542]

Deletion in 0007-on_text at line 3 [18.25]

Resurrecting zombie bytes in 0007-on_text at line 3 [18.25]

Insertion in 0007-on_text at line 3 [18.25]