akkartik/techmeet.love - Change CZCX6BWQC74E4SDA3BYE4LFTVQTJX5AUBYFKTUSK44H6EMVNL57QC

resolve conflicts

Created by akkartik on October 29, 2024

CZCX6BWQC74E4SDA3BYE4LFTVQTJX5AUBYFKTUSK44H6EMVNL57QC

Dependencies

In channels

main

Change contents

Deletion in edit.lua at line 146 [5.413]

B:BD[4.457] → [2.33:251]

BD:BD[4.457] → [2.33:251]

∅:D[2.251] → [6.222:405]

B:BD[4.654] → [6.222:405]

B:BD[6.405] → [2.253:253]

    if State.cursor1.line >= #State.lines then
      break
    end
    if State.lines[State.cursor1.line].mode == 'text' then
      break
    end
    State.cursor1.line = State.cursor1.line+1
    State.cursor1.pos = 1
  end
end
function edit.final_cursor(State)
  for i=#State.lines,1,-1 do
    if State.lines[i].mode == 'text' then
      return {line=i, pos=utf8.len(State.lines[i].data)+1}
    end

Resurrecting zombie bytes in edit.lua at line 146 [5.413]

B:B[4.441] → [3.2067:2255]

BD:B[4.441] → [3.2067:2255]

B:B[7.315] → [3.2256:2560]

BD:B[7.315] → [3.2256:2560]

B:B[7.394] → [3.2561:2889]

BD:B[7.394] → [3.2561:2889]

  local line = State.cursor1.line
  while line < #State.lines do
    line = line+1
    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
  end
end
function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
  local line = State.cursor1.line
  local max = #State.lines
  for _ = 1, max-1 do
    line = (line+1) % max
    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
  end
end
function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
  local cursor_line = State.lines[State.cursor1.line].data
  if State.cursor1.pos <= utf8.len(cursor_line) then
    State.cursor1.pos = State.cursor1.pos + 1
  else
    edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)

Insertion in edit.lua at line 152 [5.413]
[3.2255]
[3.2256]
```
      break
    end
```
Insertion in edit.lua at line 165 [5.413]
[3.2560]
[3.2561]
```
      break
    end
```

Insertion in edit.lua at line 176 [5.413]

[3.2889]

[4.654]

  end
end
function edit.final_cursor(State)
  for i=#State.lines,1,-1 do
    if State.lines[i].mode == 'text' then
      return {line=i, pos=utf8.len(State.lines[i].data)+1}
    end