akkartik/pong.love - Change KF3XPAJU354OVGRTZTHK4RBZRJRFVQ2Z4REX6QSRT7HJXOCUEPMAC

resolve conflicts

Created by akkartik on October 14, 2024

KF3XPAJU354OVGRTZTHK4RBZRJRFVQ2Z4REX6QSRT7HJXOCUEPMAC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 68 [5.1]

B:BD[4.534] → [4.534:594]

  local endpos = line_cache.screen_line_starting_pos[i+1]-1

[4.534]

[4.594]

  local endpos = line_cache.screen_line_starting_pos[i+1]

Replacement in text.lua at line 70 [5.1]

B:BD[4.646] → [4.646:689]

  return line.data:sub(offset, end_offset)

[4.646]

[4.689]

  return line.data:sub(offset, end_offset-1)

Deletion in text.lua at line 993 [5.1]
B:BD[6.144] → [7.4:62]
BD:BD[6.144] → [7.4:62]
BD:BD[6.144] → [7.4:62]
B:BD[9.1554] → [7.63:108]
BD:BD[9.1554] → [7.63:108]
BD:BD[9.1554] → [7.63:108]
```
  local endpos = line_cache.screen_line_starting_pos[i+1]
  return line.data:sub(offset, end_offset-1)
```
Solving an order conflict in text.lua at line 993 [5.1]
[11.794]
Resurrecting zombie bytes in source_text.lua at line 92 [14.83786]
B:B[12.2220] → [13.1042:1048]
BD:B[12.2220] → [13.1042:1048]
```
  end
```
Deletion in source_text.lua at line 93 [14.83786]
∅:D[13.1048] → [12.2221:2281]
B:BD[14.91121] → [12.2221:2281]
BD:BD[14.91121] → [12.2221:2281]
```
  local endpos = line_cache.screen_line_starting_pos[i+1]-1
```
Resurrecting zombie bytes in source_text.lua at line 93 [14.83786]
B:B[14.91121] → [3.8:66]
BD:B[14.91121] → [3.8:66]
```
  local endpos = line_cache.screen_line_starting_pos[i+1]
```
Solving an order conflict in source_text.lua at line 93 [14.83786]
[13.1048]
[3.8]
Resurrecting zombie bytes in source_text.lua at line 94 [14.83786]
∅:∅[3.66] → [12.2281:2333]
B:B[12.2281] → [12.2281:2333]
BD:B[12.2281] → [12.2281:2333]
```
  local end_offset = Text.offset(line.data, endpos)
```
Deletion in source_text.lua at line 95 [14.83786]
B:BD[12.2333] → [12.2333:2376]
BD:BD[12.2333] → [12.2333:2376]
```
  return line.data:sub(offset, end_offset)
```

Resurrecting zombie bytes in source_text.lua at line 95 [14.83786]

B:B[12.2376] → [13.1049:1623]

BD:B[12.2376] → [13.1049:1623]

end
function Text.draw_cursor(State, x, y)
  -- blink every 0.5s
  if math.floor(Cursor_time*2)%2 == 0 then
    App.color(Cursor_color)
    love.graphics.rectangle('fill', x,y, 3,State.line_height)
  end
  State.cursor_x = x
  State.cursor_y = y+State.line_height
end
function Text.populate_screen_line_starting_pos(State, line_index)
  local line = State.lines[line_index]
  if line.mode ~= 'text' then return end
  local line_cache = State.line_cache[line_index]
  if line_cache.screen_line_starting_pos then
    return
  end
  line_cache.screen_line_starting_pos = {1}

Insertion in source_text.lua at line 95 [14.83786]
[12.2333]
[13.1049]
```
  return line.data:sub(offset, end_offset-1)
```
Deletion in source_text.lua at line 1173 [14.83786]
B:BD[16.21703] → [2.342:342]
B:BD[12.2333] → [3.67:112]
BD:BD[12.2333] → [3.67:112]
```
  return line.data:sub(offset, end_offset-1)
```
Solving an order conflict in source_text.lua at line 1173 [14.83786]
[16.21703]

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text.lua at line 68 [5.1]

Replacement in text.lua at line 70 [5.1]

Deletion in text.lua at line 993 [5.1]

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

Resurrecting zombie bytes in source_text.lua at line 92 [14.83786]

Deletion in source_text.lua at line 93 [14.83786]

Resurrecting zombie bytes in source_text.lua at line 93 [14.83786]

Solving an order conflict in source_text.lua at line 93 [14.83786]

Resurrecting zombie bytes in source_text.lua at line 94 [14.83786]

Deletion in source_text.lua at line 95 [14.83786]

Resurrecting zombie bytes in source_text.lua at line 95 [14.83786]

Insertion in source_text.lua at line 95 [14.83786]

Deletion in source_text.lua at line 1173 [14.83786]

Solving an order conflict in source_text.lua at line 1173 [14.83786]