akkartik/carousel.love - Change O2E2MUT2SBJ3RYHEEYUZ524UPK2CDQQCW64BQNMXNTE5RWQGLH5AC

A lightweight programming environment for desktop and mobile devices

resolve conflicts

Created by akkartik on November 18, 2023

O2E2MUT2SBJ3RYHEEYUZ524UPK2CDQQCW64BQNMXNTE5RWQGLH5AC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 963 [6.1]
B:BD[5.442] → [2.995:995]
B:BD[5.442] → [4.167:167]
Resurrecting zombie bytes in edit.lua at line 106 [8.413]
B:B[7.58] → [3.15:58]
BD:B[7.58] → [3.15:58]
```
function edit.draw(State, fg, hide_cursor)
```

Resurrecting zombie bytes in edit.lua at line 107 [8.413]

B:B[7.108] → [4.8403:8764]

BD:B[7.108] → [4.8403:8764]

  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
  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))

Solving an order conflict in edit.lua at line 107 [8.413]
[3.58]
[4.8403]