akkartik/template-live-editor - Change TYLURRX3NWR66WYQSCPNFKB2N42NYKCY2TSL2Z6ZK7L4KCKFZF2QC

resolve conflicts

Created by akkartik on June 28, 2024

TYLURRX3NWR66WYQSCPNFKB2N42NYKCY2TSL2Z6ZK7L4KCKFZF2QC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua

BFD:BFD[5.2] → [6.147062:147101]

BFD:BFD[6.147101] → [6.83723:83723]

B:BD[7.21621] → [4.692:741]

B:BD[7.21770] → [4.742:791]

B:BD[7.21973] → [4.792:841]

B:BD[7.22122] → [4.842:891]

B:BD[7.22325] → [4.892:941]

B:BD[7.22474] → [4.942:991]

B:BD[7.22677] → [4.992:1041]

B:BD[7.22826] → [4.1042:1091]

B:BD[7.23029] → [4.1092:1141]

B:BD[7.23178] → [4.1142:1191]

B:BD[8.4299] → [4.1192:1238]

B:BD[8.5131] → [4.1239:1285]

B:BD[6.118525] → [4.1286:1334]

B:BD[6.145563] → [4.1335:1383]

∅:D[4.1383] → [8.7667:7723]

∅:D[4.1334] → [6.118591:118635]

∅:D[4.1285] → [6.108846:108930]

∅:D[4.1238] → [8.4374:4556]

∅:D[4.1191] → [7.23277:23285]

∅:D[4.1141] → [7.23128:23136]

∅:D[4.1091] → [7.22925:22933]

∅:D[4.1041] → [7.22776:22784]

∅:D[4.991] → [7.22573:22581]

∅:D[4.941] → [7.22424:22432]

∅:D[4.891] → [7.22221:22229]

∅:D[4.841] → [7.22072:22080]

∅:D[4.791] → [7.21869:21877]

∅:D[4.741] → [7.21720:21728]

      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
  State.cursor1 = deepcopy(State.screen_top1)
  State.cursor1 = deepcopy(State.screen_top1)
    State.screen_top1 = deepcopy(State.cursor1)
    State.cursor1 = deepcopy(State.screen_top1)
  elseif State.cursor1.line >= screen_bottom1.line then
  end
end
function Text.end_of_line(State)
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
end
    end
    end
    end
    end
    end
    end
    end
    end
    end
    end

File deletion: source_edit.lua, source_edit.lua
BFD:BFD[5.2] → [6.165725:165764]
BFD:BFD[5.2] → [6.165725:165764]
BFD:BFD[6.165764] → [6.152440:152440]
B:BD[9.2015] → [4.1384:1434]
B:BD[10.84] → [4.1435:1483]
∅:D[4.1483] → [11.12:57]
∅:D[4.1434] → [9.2094:2155]
```
      State.cursor1 = deepcopy(State.screen_top1)
    State.cursor1 = deepcopy(State.screen_top1)
    edit.put_cursor_on_next_text_line(State)
      edit.clean_up_mouse_press(State)
      return
    end
```

Replacement in source_text.lua at line 341 [14.83786]

B:BD[12.21621] → [13.2188:2262]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.21621]

[12.21720]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 346 [14.83786]

B:BD[12.21770] → [13.2263:2337]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.21770]

[12.21869]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 358 [14.83786]

B:BD[12.21973] → [13.2338:2412]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.21973]

[12.22072]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 363 [14.83786]

B:BD[12.22122] → [13.2413:2487]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.22122]

[12.22221]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 374 [14.83786]

B:BD[12.22325] → [13.2488:2562]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.22325]

[12.22424]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 379 [14.83786]

B:BD[12.22474] → [13.2563:2637]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.22474]

[12.22573]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 390 [14.83786]

B:BD[12.22677] → [13.2638:2712]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.22677]

[12.22776]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 395 [14.83786]

B:BD[12.22826] → [13.2713:2787]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.22826]

[12.22925]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 406 [14.83786]

B:BD[12.23029] → [13.2788:2862]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.23029]

[12.23128]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 411 [14.83786]

B:BD[12.23178] → [13.2863:2937]

      State.selection1 = {line=State.cursor1.line, pos=State.cursor1.pos}

[12.23178]

[12.23277]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 428 [14.83786]

B:BD[2.2372] → [2.2372:2447]

  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

[2.2372]

[2.2447]

  State.cursor1 = deepcopy(State.screen_top1)

Replacement in source_text.lua at line 477 [14.83786]
∅:D[2.4184] → [13.3945:4020]
B:BD[14.108805] → [13.3945:4020]
```
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
```
[2.4184]
[14.108909]
```
  State.cursor1 = deepcopy(State.screen_top1)
```

Replacement in source_text.lua at line 597 [14.83786]

B:BD[14.118588] → [13.4328:4410]

    State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos}  -- copy

[14.118588]

[14.118654]

    State.screen_top1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 1106 [14.83786]

B:BD[14.145626] → [14.145626:145703]

    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

[14.145626]

[2.7690]

    State.cursor1 = deepcopy(State.screen_top1)

Replacement in source_edit.lua at line 311 [14.152503]

B:BD[15.1036] → [15.1036:1115]

      State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

[15.1036]

[15.1115]

      State.cursor1 = deepcopy(State.screen_top1)

Replacement in source_edit.lua at line 354 [14.152503]

B:BD[16.84] → [16.84:161]

    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

[16.84]

[17.1069]

    State.cursor1 = deepcopy(State.screen_top1)

Replacement in edit.lua at line 201 [18.413]

B:BD[15.1953] → [15.1953:2030]

    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

[15.1953]

[15.2030]

    State.cursor1 = deepcopy(State.screen_top1)

Replacement in edit.lua at line 240 [18.413]

B:BD[19.4804] → [19.4804:4881]

    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

[19.4804]

[19.4881]

    State.cursor1 = deepcopy(State.screen_top1)

Insertion in edit.lua at line 285 [18.413]

[19.6765]

      State.cursor = deepcopy(State.search_backup.cursor)
      State.screen_top = deepcopy(State.search_backup.screen_top)
      Text.search_next(State)

Deletion in edit.lua at line 452 [18.413]

B:BD[19.12430] → [2.9190:9190]

B:BD[10.1937] → [4.1535:1583]

BD:BD[10.1937] → [4.1535:1583]

B:BD[9.2934] → [4.1484:1534]

BD:BD[9.2934] → [4.1484:1534]

B:BD[20.7460] → [3.0:154]

BD:BD[20.7460] → [3.0:154]

    State.cursor1 = deepcopy(State.screen_top1)
      State.cursor1 = deepcopy(State.screen_top1)
      State.cursor = deepcopy(State.search_backup.cursor)
      State.screen_top = deepcopy(State.search_backup.screen_top)
      Text.search_next(State)

Solving an order conflict in edit.lua at line 452 [18.413]
[19.12430]