akkartik/snap.love - Change LMWVTKPYTMQYYN3MCVG7QRO4G3WCDH6RNBX7SWMT7LFBTUIQF6XAC

resolve conflicts

Created by akkartik on March 19, 2025

LMWVTKPYTMQYYN3MCVG7QRO4G3WCDH6RNBX7SWMT7LFBTUIQF6XAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in 0039-on_node at line 3 [4.25]
B:B[4.114] → [5.92:141]
BD:B[4.114] → [5.92:141]
```
			if sx >= node.x and sx < node.x + node.w then
```
Insertion in 0039-on_node at line 3 [4.25]
[4.84]
[5.92]
```
		if node.type == 'text' then
```
Deletion in 0039-on_node at line 6 [4.25]
B:BD[6.2790] → [7.55:55]
B:BD[4.84] → [3.598:643]
BD:BD[4.84] → [3.598:643]
```
		if node.type == 'text' and node.width then
```
Solving an order conflict in 0039-on_node at line 6 [4.25]
[6.2790]
[4.247]
Replacement in 0026-on.draw at line 18 [8.238692]
B:BD[8.240278] → [9.410:434]
```
			if obj.w == nil then
```
[8.240278]
[9.434]
```
			if obj.width == nil then
```
Deletion in 0026-on.draw at line 22 [8.238692]
B:BD[9.569] → [7.244:244]
B:BD[8.240278] → [3.0:28]
BD:BD[8.240278] → [3.0:28]
```
			if obj.width == nil then
```
Solving an order conflict in 0026-on.draw at line 22 [8.238692]
[9.569]
[8.241330]

Deletion in 0010-initialize_editor at line 2 [10.542]

B:BD[10.592] → [7.273:369]

BD:BD[10.592] → [7.273:369]

B:BD[7.369] → [2.84:244]

∅:D[2.244] → [11.74:142]

∅:D[7.504] → [11.74:142]

B:BD[10.859] → [11.74:142]

BD:BD[2.244] → [11.74:142]

BD:BD[7.504] → [11.74:142]

BD:BD[10.859] → [11.74:142]

B:BD[10.577] → [3.239:274]

		local scaled_fontsize = scale(20)
		local scaled_lineheight = math.floor(scaled_fontsize*1.3)
		obj.editor = edit.initialize_state(vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), love.graphics.getFont(), scaled_fontsize, scaled_lineheight)
		if obj.data then
			obj.editor.lines = load_array(obj.data)
		end
	-- use an editor to wrap the text

Replacement in 0010-initialize_editor at line 5 [10.542]

B:BD[3.527] → [3.527:568]

	obj.editor.lines = load_array(obj.data)

[3.527]

[3.568]

	if obj.data then
		obj.editor.lines = load_array(obj.data)
	end

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in 0039-on_node at line 3 [4.25]

Insertion in 0039-on_node at line 3 [4.25]

Deletion in 0039-on_node at line 6 [4.25]

Solving an order conflict in 0039-on_node at line 6 [4.25]

Replacement in 0026-on.draw at line 18 [8.238692]

Deletion in 0026-on.draw at line 22 [8.238692]

Solving an order conflict in 0026-on.draw at line 22 [8.238692]

Deletion in 0010-initialize_editor at line 2 [10.542]

Replacement in 0010-initialize_editor at line 5 [10.542]