akkartik/sokoban.love - Change DALNQKAVQB53LC7MLAEYEPZNHJDAGEXFBDZUMORKGKE5CUDGY3WQC

resolve conflicts

Created by akkartik on November 18, 2023

DALNQKAVQB53LC7MLAEYEPZNHJDAGEXFBDZUMORKGKE5CUDGY3WQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 19 [6.1]

B:B[4.63] → [5.3583:3747]

BD:B[4.63] → [5.3583:3747]

  App.color(Line_number_color)
  love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)
  if fg == nil then
    initialize_color()
  end

Solving an order conflict in text.lua at line 24 [6.1]
[5.3747]
[7.532]
Resurrecting zombie bytes in text.lua at line 239 [6.1]
B:B[8.3000] → [9.81:143]
BD:B[8.3000] → [9.81:143]
```
    Text.refresh_screen_line_cache(State, State.cursor1.line)
```

Resurrecting zombie bytes in text.lua at line 240 [6.1]

B:B[10.122] → [7.702:916]

BD:B[10.122] → [7.702:916]

    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 text.lua at line 240 [6.1]
[9.143]
[7.702]
Resurrecting zombie bytes in text.lua at line 627 [6.1]
B:B[11.2683] → [12.266:321]
BD:B[11.2683] → [12.266:321]
```
  if State.top > State.bottom - State.line_height then
```
Deletion in text.lua at line 628 [6.1]
∅:D[12.321] → [13.4:4]
BD:BD[14.6899] → [13.4:4]
B:BD[14.6899] → [3.163:163]
BD:BD[14.6899] → [3.163:163]
Solving an order conflict in text.lua at line 628 [6.1]
[12.321]
[15.1554]

Deletion in edit.lua at line 111 [17.413]

B:BD[16.339] → [2.0:114]

BD:BD[16.339] → [2.0:114]

    print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
    assert(false)

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 19 [6.1]

Solving an order conflict in text.lua at line 24 [6.1]

Resurrecting zombie bytes in text.lua at line 239 [6.1]

Resurrecting zombie bytes in text.lua at line 240 [6.1]

Solving an order conflict in text.lua at line 240 [6.1]

Resurrecting zombie bytes in text.lua at line 627 [6.1]

Deletion in text.lua at line 628 [6.1]

Solving an order conflict in text.lua at line 628 [6.1]

Deletion in edit.lua at line 111 [17.413]