akkartik/carousel.love - Change FHZ5AG3MCKSJQWTENRB54NDDPPG6NNOVRBYBS4F3T7JCGKY3AANQC

resolve conflicts

Created by akkartik on October 29, 2024

FHZ5AG3MCKSJQWTENRB54NDDPPG6NNOVRBYBS4F3T7JCGKY3AANQC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua
BFD:BFD[4.2] → [5.165725:165764]
BFD:BFD[4.2] → [5.165725:165764]
BFD:BFD[5.165764] → [5.152440:152440]
B:BD[7.1045] → [3.12:38]
∅:D[3.38] → [7.1122:1164]
```
        Text.right(State)
        Text.search_next(State)
      end
```

Deletion in source_edit.lua at line 148 [8.152503]

B:BD[6.1084] → [6.1084:1189]

∅:D[6.1189] → [9.563:583]

B:BD[9.563] → [9.563:583]

B:BD[9.583] → [6.1190:1389]

    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
      break
    end
  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

Deletion in source_edit.lua at line 153 [8.152503]

B:BD[9.662] → [6.1495:1823]

  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)

Replacement in source_edit.lua at line 414 [8.152503]

B:BD[6.2018] → [6.2018:2095]

        edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)

[6.2018]

[6.2095]

        Text.right(State)

Deletion in edit.lua at line 98 [11.413]

B:BD[10.754] → [6.2155:2160]

B:BD[6.2160] → [2.126:200]

∅:D[2.200] → [6.2239:2722]

B:BD[6.2239] → [6.2239:2722]

B:BD[6.2722] → [2.201:270]

∅:D[2.270] → [6.2796:2802]

B:BD[6.2796] → [6.2796:2802]

end
function edit.put_cursor_on_next_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
      break
    end
  end
end
function edit.put_cursor_on_next_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_line_wrapping_around_if_necessary(State)
  end

Replacement in edit.lua at line 287 [11.413]

B:BD[6.2840] → [6.2840:2912]

        edit.put_cursor_on_next_loc_wrapping_around_if_necessary(State)

[6.2840]

[6.2912]

        Text.right(State)

Deletion in edit.lua at line 447 [11.413]
B:BD[12.12430] → [6.2956:2956]
B:BD[13.72] → [3.56:82]
BD:BD[13.72] → [3.56:82]
```
        Text.right(State)
```
Solving an order conflict in edit.lua at line 447 [11.413]
[12.12430]