akkartik/techmeet-capture.love - Change APOMBXMUSQMQPV2ERSMI4Y3T53PS2JB7P5OTK5GDGATCTBCAUWRAC

resolve conflicts

Created by akkartik on November 18, 2023

APOMBXMUSQMQPV2ERSMI4Y3T53PS2JB7P5OTK5GDGATCTBCAUWRAC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 38 [5.178044]

B:BD[4.254] → [4.254:303]

  assert(not file_exists(Editor_state.filename))

[4.254]

[6.114]

  assert(not file_exists(Editor_state.filename), 'refusing to overwrite existing file at current timestamp')

Replacement in edit.lua at line 162 [8.413]

B:BD[7.533] → [7.533:884]

  if #State.lines ~= #State.line_cache then
    print(('line_cache is out of date; %d when it should be %d'):format(#State.line_cache, #State.lines))
    assert(false)
  end
  if not Text.le1(State.screen_top1, State.cursor1) then
    print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
    assert(false)
  end

[7.533]

[7.884]

  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
  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))

Replacement in edit.lua at line 203 [8.413]

B:BD[7.2646] → [7.2646:2689]

      print(line.mode)
      assert(false)

[7.2646]

[7.2689]

      assert(false, ('unknown line mode %s'):format(line.mode))

Deletion in edit.lua at line 622 [8.413]

B:BD[7.17561] → [2.126:126]

B:BD[8.5492] → [3.7493:7557]

BD:BD[8.5492] → [3.7493:7557]

B:BD[9.1023] → [3.7131:7492]

BD:BD[9.1023] → [3.7131:7492]

      assert(false, ('unknown line mode %s'):format(line.mode))
  assert(#State.lines == #State.line_cache, ('line_cache is out of date; %d elements when it should be %d'):format(#State.line_cache, #State.lines))
  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 edit.lua at line 622 [8.413]
[7.17561]