akkartik/techmeet-capture.love - Change 235D5R3ZZ7N5KRIRVRIZXDCR6IYZKZ77LDXZGLUIJAJLRLBZKJ2QC

resolve conflicts

Created by akkartik on June 28, 2024

235D5R3ZZ7N5KRIRVRIZXDCR6IYZKZ77LDXZGLUIJAJLRLBZKJ2QC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 308 [6.413]

B:BD[5.111] → [5.111:190]

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

[5.111]

[5.190]

      State.cursor1 = deepcopy(State.screen_top1)

Replacement in edit.lua at line 351 [6.413]

B:BD[7.7547] → [7.7547:7624]

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

[7.7547]

[7.7624]

    State.cursor1 = deepcopy(State.screen_top1)

Insertion in edit.lua at line 408 [6.413]

[7.10138]

      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 615 [6.413]

B:BD[7.17561] → [2.626:626]

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

BD:BD[8.1937] → [4.1535:1583]

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

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

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

BD:BD[10.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 615 [6.413]
[7.17561]