akkartik/techmeet-capture.love - Change TWSPUEHFY7BNYW5VKGERLFMSWDLEM4P6MPPJG37MDDIR32GKP2JAC

resolve conflicts

Created by akkartik on July 10, 2024

TWSPUEHFY7BNYW5VKGERLFMSWDLEM4P6MPPJG37MDDIR32GKP2JAC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 400 [5.413]

B:BD[4.9726] → [4.9726:9823]

      Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks

[4.9726]

[4.9823]

      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks

Deletion in edit.lua at line 445 [5.413]

B:BD[4.11364] → [4.11364:11434]

      patch_placeholders(State.line_cache, event.after, event.before)

Replacement in edit.lua at line 447 [5.413]

B:BD[4.11523] → [4.11523:11625]

      -- if we're scrolling, reclaim all fragments to avoid memory leaks
      Text.redraw_all(State)

[4.11523]

[4.11625]

      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks

Replacement in edit.lua at line 460 [5.413]

B:BD[4.12164] → [4.12164:12266]

      -- if we're scrolling, reclaim all fragments to avoid memory leaks
      Text.redraw_all(State)

[4.12164]

[4.12266]

      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks

Deletion in edit.lua at line 612 [5.413]

B:BD[4.17561] → [2.285:285]

B:BD[6.296] → [3.1915:2014]

BD:BD[6.296] → [3.1915:2014]

B:BD[6.104] → [3.1815:1914]

BD:BD[6.104] → [3.1815:1914]

B:BD[7.7184] → [3.1715:1814]

BD:BD[7.7184] → [3.1715:1814]

      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks
      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks
      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks

Solving an order conflict in edit.lua at line 612 [5.413]
[4.17561]