akkartik/luaML.love - Change 6MOVF56VNHVCQ3HOPPVAA2XXZV2RQHW6N5ZUS5BYIGK3FD2DMBZQC

resolve conflicts

Created by akkartik on November 18, 2023

6MOVF56VNHVCQ3HOPPVAA2XXZV2RQHW6N5ZUS5BYIGK3FD2DMBZQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 438 [5.1]

B:B[4.1280] → [2.509:668]

BD:B[4.1280] → [2.509:668]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Resurrecting zombie bytes in text.lua at line 439 [5.1]
B:B[7.6132] → [6.1153:1202]
BD:B[7.6132] → [6.1153:1202]
```
  assert(State.cursor1.pos, 'cursor has no pos')
```
Solving an order conflict in text.lua at line 439 [5.1]
[2.668]
[6.1153]
Deletion in text.lua at line 639 [5.1]
B:BD[9.6974] → [10.165:165]
BD:BD[9.6974] → [10.165:165]
Solving an order conflict in text.lua at line 639 [5.1]
[2.1655]
[4.2833]

Deletion in edit.lua at line 108 [11.413]

B:BD[10.8552] → [10.8552:8764]

  assert(Text.le1(State.screen_top1, State.cursor1), ('screen_top (line=%d,pos=%d) is below cursor (line=%d,pos=%d)'):format(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos))

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 438 [5.1]

Resurrecting zombie bytes in text.lua at line 439 [5.1]

Solving an order conflict in text.lua at line 439 [5.1]

Deletion in text.lua at line 639 [5.1]

Solving an order conflict in text.lua at line 639 [5.1]

Deletion in edit.lua at line 108 [11.413]