akkartik/techmeet-capture.love - Change ZDPKT7VBD3UPDQQH26PJECMSQG6QSVHNIRRULDKLRUXM2LBTSV6AC

resolve conflicts

Created by akkartik on January 22, 2025

ZDPKT7VBD3UPDQQH26PJECMSQG6QSVHNIRRULDKLRUXM2LBTSV6AC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 146 [5.413]

B:BD[4.63] → [4.63:94]

  while line < #State.lines do

[4.63]

[4.94]

  if State.lines[line].mode == 'text' then return end
  while line <= #State.lines and State.lines[line].mode ~= 'text' do

Replacement in edit.lua at line 149 [5.413]

B:BD[4.112] → [4.112:217]

∅:D[4.217] → [6.113:133]

B:BD[6.113] → [6.113:133]

    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
      break
    end

[4.112]

[7.349]

  end
  if line <= #State.lines and State.lines[line].mode == 'text' then
    State.cursor1.line = line
    State.cursor1.pos = 1

Deletion in edit.lua at line 611 [5.413]

B:BD[7.17561] → [2.57:57]

B:BD[8.2150] → [3.408:538]

BD:BD[8.2150] → [3.408:538]

B:BD[8.2101] → [3.284:407]

BD:BD[8.2101] → [3.284:407]

  end
  if line <= #State.lines and State.lines[line].mode == 'text' then
    State.cursor1.line = line
    State.cursor1.pos = 1
  if State.lines[line].mode == 'text' then return end
  while line <= #State.lines and State.lines[line].mode ~= 'text' do

Solving an order conflict in edit.lua at line 611 [5.413]
[7.17561]