akkartik/luaML.love - Change X5XUIB72LUUBXFEN37FDAFVFBPTMY5UHDQZ7675SRLI52YB6AUOQC

resolve conflicts

Created by akkartik on May 6, 2025

X5XUIB72LUUBXFEN37FDAFVFBPTMY5UHDQZ7675SRLI52YB6AUOQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 168 [10.1]

B:BD[8.1137] → [9.271:324]

B:BD[8.1137] → [11.0:69]

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

[8.1137]

[12.48]

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

Resurrecting zombie bytes in main.lua at line 184 [15.2]
B:B[13.6775] → [14.59:123]
BD:B[13.6775] → [14.59:123]
```
function App.mousepressed(x,y, mouse_button, is_touch, presses)
```

Replacement in main.lua at line 186 [15.2]

B:BD[13.6894] → [17.50:113]

B:BD[17.113] → [5.11:11]

B:BD[18.84] → [14.124:202]

BD:BD[18.84] → [14.124:202]

  if on.mouse_press then on.mouse_press(x,y, mouse_button) end
  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)

[13.6894]

[13.6955]

  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  if on.mouse_press then on.mouse_press(x,y, mouse_button, is_touch, presses) end

Replacement in main.lua at line 192 [15.2]

B:BD[13.7080] → [17.114:181]

  if on.mouse_release then on.mouse_release(x,y, mouse_button) end

[13.7080]

[2.310]

  if on.mouse_release then on.mouse_release(x,y, mouse_button, is_touch, presses) end

Deletion in main.lua at line 197 [15.2]
∅:D[2.423] → [19.13:13]
B:BD[17.181] → [19.13:13]
B:BD[13.7080] → [14.269:349]
```
  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
```
Solving an order conflict in main.lua at line 197 [15.2]
[2.423]
[13.7142]
Deletion in main.lua at line 223 [15.2]
B:BD[20.524] → [21.1220:1220]
BD:BD[20.524] → [21.1220:1220]
Solving an order conflict in main.lua at line 223 [15.2]
[20.524]
[22.2031]
Replacement in main.lua at line 229 [15.2]
B:BD[13.7306] → [21.1221:1283]
B:BD[21.1283] → [23.11:11]
B:BD[13.7306] → [14.350:426]
BD:BD[13.7306] → [14.350:426]
∅:D[14.426] → [24.12:12]
BD:BD[25.67] → [24.12:12]
```
  if on.keychord_press then on.keychord_press(chord, key) end
  return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
```
[13.7306]
[26.223]
```
  if on.keychord_press then on.keychord_press(chord, key, scancode, is_repeat) end
```
Deletion in main.lua at line 246 [15.2]
B:BD[27.889] → [14.428:428]
BD:BD[27.889] → [14.428:428]
B:BD[29.336] → [7.12:12]
BD:BD[29.336] → [7.12:12]
∅:D[7.12] → [30.359:363]
∅:D[30.359] → [30.359:363]
B:BD[30.359] → [30.359:363]
B:BD[26.466] → [31.72:78]
```
end
  end
```
Solving an order conflict in main.lua at line 246 [15.2]
[27.889]
[31.78]
Deletion in main.lua at line 257 [15.2]
B:BD[32.243] → [3.476:476]
BD:BD[32.243] → [3.476:476]
Resurrecting zombie bytes in main.lua at line 257 [15.2]
∅:∅[33.12] → [34.151:155]
∅:∅[3.476] → [34.151:155]
∅:∅[35.589] → [34.151:155]
B:B[34.151] → [34.151:155]
D:∅[36.12] → [34.151:155]
D:∅[33.12] → [34.151:155]
D:∅[37.12] → [34.151:155]
BD:B[34.151] → [34.151:155]
```
end
```
Deletion in main.lua at line 258 [15.2]
B:BD[13.2567] → [14.58:58]
BD:BD[13.2567] → [14.58:58]
Solving an order conflict in main.lua at line 258 [15.2]
[34.155]

Replacement in edit.lua at line 264 [41.413]

B:BD[39.5460] → [40.267:325]

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

[39.5460]

[40.325]

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

Deletion in edit.lua at line 266 [41.413]
B:BD[39.5460] → [22.3134:3203]
BD:BD[39.5460] → [22.3134:3203]
```
function edit.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in edit.lua at line 266 [41.413]
[40.373]
[39.5539]

Replacement in edit.lua at line 374 [41.413]

B:BD[39.10318] → [40.562:610]

B:BD[39.10211] → [22.3204:3268]

    Text.keychord_press(State, chord, readonly)
    Text.keychord_press(State, chord, key, scancode, is_repeat)

[39.10211]

[39.10356]

    Text.keychord_press(State, chord, key, scancode, is_repeat, readonly)

Deletion in app.lua at line 585 [43.2]

B:BD[42.212] → [6.86:151]

BD:BD[42.212] → [6.86:151]

B:BD[42.330] → [6.152:232]

BD:BD[42.330] → [6.152:232]

        love.handlers[name] = function(key, scancode, is_repeat)
                                return App.keypressed(key, scancode, is_repeat)

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text.lua at line 168 [10.1]

Resurrecting zombie bytes in main.lua at line 184 [15.2]

Replacement in main.lua at line 186 [15.2]

Replacement in main.lua at line 192 [15.2]

Deletion in main.lua at line 197 [15.2]

Solving an order conflict in main.lua at line 197 [15.2]

Deletion in main.lua at line 223 [15.2]

Solving an order conflict in main.lua at line 223 [15.2]

Replacement in main.lua at line 229 [15.2]

Deletion in main.lua at line 246 [15.2]

Solving an order conflict in main.lua at line 246 [15.2]

Deletion in main.lua at line 257 [15.2]

Resurrecting zombie bytes in main.lua at line 257 [15.2]

Deletion in main.lua at line 258 [15.2]

Solving an order conflict in main.lua at line 258 [15.2]

Replacement in edit.lua at line 264 [41.413]

Deletion in edit.lua at line 266 [41.413]

Solving an order conflict in edit.lua at line 266 [41.413]

Replacement in edit.lua at line 374 [41.413]

Deletion in app.lua at line 585 [43.2]