akkartik/pensieve.love - Change ONZ2K5SLNTWFZFPAI2LPA5JWFCYE2557V2DRDF3XML3VIUV7XZ4QC

resolve conflicts

Created by akkartik on December 7, 2023

ONZ2K5SLNTWFZFPAI2LPA5JWFCYE2557V2DRDF3XML3VIUV7XZ4QC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 225 [6.2]
B:BD[5.1104] → [5.1104:1154]
BD:BD[5.1104] → [5.1104:1154]
```
      love.system.setClipboardText(Error_message)
```
Resurrecting zombie bytes in main.lua at line 229 [6.2]
∅:∅[7.1446] → [5.1154:1179]
B:B[5.1154] → [5.1154:1179]
BD:B[5.1154] → [5.1154:1179]
```
    end
    return
  end
```
Deletion in main.lua at line 376 [6.2]
B:BD[8.1581] → [2.1305:1305]

Replacement in Manual_tests.md at line 16 [10.1]

B:BD[9.6616] → [2.1612:1748]

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

[9.6616]

[2.1748]

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

Insertion in Manual_tests.md at line 18 [10.1]

[2.1846]

[11.306]

  - create a couple of spuriously failing tests. Run with an untested version of LÖVE. Error message includes message about untested version.

Deletion in Manual_tests.md at line 39 [10.1]

B:BD[12.156] → [4.39:184]

BD:BD[12.156] → [4.39:184]

  - run with an untested version of LÖVE. 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 162 [10.1]
B:BD[11.329] → [2.1848:1848]

Resurrecting zombie bytes in Manual_tests.md at line 162 [10.1]

B:B[2.1848] → [2.1849:2026]

BD:B[2.1848] → [2.1849:2026]

* start out in the note-taking app, press ctrl+w to edit source, make a change to the source, press ctrl+w twice to return to the source editor; the change should be preserved.

Deletion in Manual_tests.md at line 163 [10.1]

B:BD[2.2026] → [2.2026:2258]

BD:BD[2.2026] → [2.2026:2258]

∅:D[7.1918] → [13.1971:2103]

∅:D[2.2258] → [13.1971:2103]

B:BD[13.1971] → [13.1971:2103]

D:D[7.1918] → [13.1971:2103]

BD:BD[13.1971] → [13.1971:2103]

B:BD[14.211526] → [4.329:586]

BD:BD[14.211526] → [4.329:586]

* run with an untested version. Error message pops up. Press a key. App comes up, and doesn't receive the key. Press ctrl+w. Error pops up. Press a key. Source editor opens up. Press ctrl+w. Error pops up. Press a key. App returns.
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.
* run with an untested version of LÖVE. Error message pops up. Press a key. Text editor comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Text editor returns.

Solving an order conflict in Manual_tests.md at line 163 [10.1]
[2.2026]

Insertion in Manual_tests.md at line 163 [10.1]

[0.365]

[14.211526]

* run with an untested version of LÖVE. Error message pops up. Press a key. App comes up, and doesn't receive the key. Press ctrl+w. Error pops up. Press a key. Source editor opens up. Press ctrl+w. Error pops up. Press a key. App returns.

Deletion in Manual_tests.md at line 191 [10.1]
B:BD[16.16279] → [2.2260:2260]
B:BD[17.121] → [4.185:328]
BD:BD[17.121] → [4.185:328]
BD:BD[17.121] → [4.185:328]
```
  - create a couple of spuriously failing tests. Run with an untested version of LÖVE. Error message includes message about untested version.
```
Solving an order conflict in Manual_tests.md at line 191 [10.1]
[16.16279]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in main.lua at line 225 [6.2]

Resurrecting zombie bytes in main.lua at line 229 [6.2]

Deletion in main.lua at line 376 [6.2]

Replacement in Manual_tests.md at line 16 [10.1]

Insertion in Manual_tests.md at line 18 [10.1]

Deletion in Manual_tests.md at line 39 [10.1]

Deletion in Manual_tests.md at line 162 [10.1]

Resurrecting zombie bytes in Manual_tests.md at line 162 [10.1]

Deletion in Manual_tests.md at line 163 [10.1]

Solving an order conflict in Manual_tests.md at line 163 [10.1]

Insertion in Manual_tests.md at line 163 [10.1]

Deletion in Manual_tests.md at line 191 [10.1]

Solving an order conflict in Manual_tests.md at line 191 [10.1]