akkartik/pensieve.love - Change ERDWENQLGFKMHSY7CKXZQYXEICKXBZ4RYQZPOSAJ2IQTWGAE3PXQC

resolve conflicts

Created by akkartik on December 3, 2023

ERDWENQLGFKMHSY7CKXZQYXEICKXBZ4RYQZPOSAJ2IQTWGAE3PXQC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 83 [7.2]

B:BD[4.201] → [4.201:285]

  local supported_versions = {'11.4', '12.0'}  -- put the recommended version first

[4.201]

[4.285]

  local supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first

Deletion in main.lua at line 125 [7.2]

B:BD[8.198] → [5.20:112]

BD:BD[8.198] → [5.20:112]

  local supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first

Deletion in main.lua at line 270 [7.2]
B:BD[9.190302] → [9.190302:190333]
BD:BD[9.190302] → [9.190302:190333]
```
  if Current_app == 'run' then
```

Insertion in Manual_tests.md at line 16 [12.1]

[3.6616]

  - run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

Deletion in Manual_tests.md at line 36 [12.1]
∅:D[13.229] → [14.950:951]
∅:D[3.7785] → [14.950:951]
B:BD[14.950] → [14.950:951]
B:BD[14.951] → [2.75:75]
Resurrecting zombie bytes in Manual_tests.md at line 36 [12.1]
B:B[15.685] → [11.155:156]
BD:B[15.685] → [11.155:156]
Solving an order conflict in Manual_tests.md at line 36 [12.1]
[3.7785]
[11.155]

Deletion in Manual_tests.md at line 37 [12.1]

B:BD[11.156] → [11.156:295]

BD:BD[11.156] → [11.156:295]

  - run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

Deletion in Manual_tests.md at line 160 [12.1]

B:BD[17.11769] → [10.64996:64996]

B:BD[9.211526] → [6.23:238]

BD:BD[9.211526] → [6.23:238]

* run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key. Press ctrl+e to edit source. Source editor opens up without checking version.

Solving an order conflict in Manual_tests.md at line 160 [12.1]
[17.11769]

Insertion in Manual_tests.md at line 160 [12.1]

[0.311]

[9.211526]


Source editing:
* start out running the text editor, press ctrl+w to edit source, make a change to the source, press ctrl+e twice to return to the source editor; the change should be preserved.
* run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key. Press ctrl+w to edit source. Source editor opens up without checking version.

resolve conflicts

Dependencies

In channels

Change contents

Replacement in main.lua at line 83 [7.2]

Deletion in main.lua at line 125 [7.2]

Deletion in main.lua at line 270 [7.2]

Insertion in Manual_tests.md at line 16 [12.1]

Deletion in Manual_tests.md at line 36 [12.1]

Resurrecting zombie bytes in Manual_tests.md at line 36 [12.1]

Solving an order conflict in Manual_tests.md at line 36 [12.1]

Deletion in Manual_tests.md at line 37 [12.1]

Deletion in Manual_tests.md at line 160 [12.1]

Solving an order conflict in Manual_tests.md at line 160 [12.1]

Insertion in Manual_tests.md at line 160 [12.1]