akkartik/luaML.love - Change XVXLKRLJD4XKM7ZHPMCXIOS4YISAVTNYIC3RQCEAU5YWQUMG6TBQC

resolve conflicts

Created by akkartik on November 12, 2025

XVXLKRLJD4XKM7ZHPMCXIOS4YISAVTNYIC3RQCEAU5YWQUMG6TBQC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 131 [9.2]
B:BD[7.220] → [7.220:277]
BD:BD[7.220] → [7.220:277]
```
  local os = love.system.getOS()
  if os == 'Linux' then
```

Resurrecting zombie bytes in main.lua at line 132 [9.2]

∅:∅[6.66] → [7.277:513]

B:B[7.277] → [7.277:513]

BD:B[7.277] → [7.277:513]

    -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
    App.screen.move(settings.x, settings.y-37, settings.displayindex)
  else
    App.screen.move(settings.x, settings.y, settings.displayindex)
  end

Resurrecting zombie bytes in main.lua at line 143 [9.2]
∅:∅[2.40] → [7.513:518]
∅:∅[8.695] → [7.513:518]
B:B[7.513] → [7.513:518]
BD:B[7.513] → [7.513:518]
```
end
```
Insertion in edit.lua at line 267 [11.413]
[5.509]
[10.325]
```
  local dm = App.default_modifier
```

Replacement in edit.lua at line 320 [11.413]

B:BD[12.7575] → [10.374:420]

B:BD[12.7575] → [13.1166:1197]

  elseif not readonly and chord == 'C-z' then
  elseif chord == dm('z') then

[12.7575]

[12.7711]

  elseif not readonly and chord == dm('z') then

Replacement in edit.lua at line 331 [11.413]

B:BD[12.8198] → [10.421:467]

B:BD[12.8198] → [13.1198:1229]

  elseif not readonly and chord == 'C-y' then
  elseif chord == dm('y') then

[12.8198]

[12.8334]

  elseif not readonly and chord == dm('y') then

Deletion in edit.lua at line 351 [11.413]
B:BD[12.9035] → [10.468:514]
B:BD[10.514] → [4.19:19]
B:BD[12.9035] → [13.1294:1325]
```
  elseif not readonly and chord == 'C-x' then
  elseif chord == dm('x') then
```
Resurrecting zombie bytes in edit.lua at line 351 [11.413]
∅:∅[4.19] → [14.365:427]
∅:∅[13.1325] → [14.365:427]
B:B[12.9064] → [14.365:427]
BD:B[12.9064] → [14.365:427]
```
    local s = Text.cut_selection_and_record_undo_event(State)
```
Insertion in edit.lua at line 351 [11.413]
[12.9035]
[14.365]
```
  elseif not readonly and chord == dm('x') then
```

Replacement in edit.lua at line 357 [11.413]

B:BD[12.9310] → [10.515:561]

B:BD[12.9310] → [13.1326:1357]

  elseif not readonly and chord == 'C-v' then
  elseif chord == dm('v') then

[12.9310]

[12.9446]

  elseif not readonly and chord == dm('v') then

Deletion in edit.lua at line 454 [11.413]
B:BD[12.12430] → [13.1359:1359]
B:BD[15.3203] → [13.807:841]
BD:BD[15.3203] → [13.807:841]
BD:BD[15.3203] → [13.807:841]
```
  local dm = App.default_modifier
```
Solving an order conflict in edit.lua at line 454 [11.413]
[12.12430]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 131 [9.2]

Resurrecting zombie bytes in main.lua at line 132 [9.2]

Resurrecting zombie bytes in main.lua at line 143 [9.2]

Insertion in edit.lua at line 267 [11.413]

Replacement in edit.lua at line 320 [11.413]

Replacement in edit.lua at line 331 [11.413]

Deletion in edit.lua at line 351 [11.413]

Resurrecting zombie bytes in edit.lua at line 351 [11.413]

Insertion in edit.lua at line 351 [11.413]

Replacement in edit.lua at line 357 [11.413]

Deletion in edit.lua at line 454 [11.413]

Solving an order conflict in edit.lua at line 454 [11.413]