akkartik/pong.love - Change T5XFS4P4OQEPQAWNHEMZ57R6FRA6YEZ7KOCKSAZQH3HW3AA4XM4QC

resolve conflicts

Created by akkartik on December 9, 2023

T5XFS4P4OQEPQAWNHEMZ57R6FRA6YEZ7KOCKSAZQH3HW3AA4XM4QC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 838 [5.1]

B:BD[4.112403] → [4.112403:112426]

    print(pos1, #s, s)

[4.112403]

[4.112426]

    assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))

Deletion in text.lua at line 840 [5.1]

B:BD[4.112432] → [6.1407:1493]

  assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")

Deletion in text.lua at line 956 [5.1]

B:BD[4.115545] → [2.242:242]

B:BD[7.1005] → [8.4:174]

BD:BD[7.1005] → [8.4:174]

    assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))

Solving an order conflict in text.lua at line 956 [5.1]
[4.115545]

Replacement in source_text.lua at line 977 [11.83786]

B:BD[9.138597] → [9.138597:138620]

    print(pos1, #s, s)

[9.138597]

[9.138620]

    assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))

Deletion in source_text.lua at line 979 [11.83786]

B:BD[9.138626] → [6.3195:3281]

  assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")

Deletion in source_text.lua at line 1074 [11.83786]

B:BD[11.142357] → [3.8:178]

BD:BD[11.142357] → [3.8:178]

    assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))