akkartik/pong.love - Change 5UYJGPDH5FWK3G7M3BSTGTMCLHBD5ADMOB4MKZCXLNE6O7KLUNEAC

resolve conflicts

Created by akkartik on December 7, 2023

5UYJGPDH5FWK3G7M3BSTGTMCLHBD5ADMOB4MKZCXLNE6O7KLUNEAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 356 [5.2]
B:BD[4.1581] → [2.1957:1957]

Replacement in Manual_tests.md at line 14 [7.1]

B:BD[6.256] → [2.2471:2607]

  - 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.

[6.256]

[2.2607]

  - 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 16 [7.1]

[2.2705]

[8.194]

  - 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 22 [7.1]

B:BD[9.40] → [3.39:184]

BD:BD[9.40] → [3.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.

Replacement in Manual_tests.md at line 28 [7.1]

B:BD[10.868] → [2.2706:3072]

* run with an untested version. Error message pops up. Press a key. Pong 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. Pong returns.
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.

[10.868]

[11.211091]

* run with an untested version of LÖVE. Error message pops up. Press a key. Pong 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. Pong returns.

Deletion in Manual_tests.md at line 56 [7.1]

B:BD[12.16279] → [2.3074:3074]

B:BD[12.16279] → [3.332:332]

B:BD[13.211526] → [14.329:586]

BD:BD[13.211526] → [14.329:586]

B:BD[16.2163] → [3.185:328]

BD:BD[16.2163] → [3.185:328]

B:BD[18.260] → [3.330:330]

BD:BD[18.260] → [3.330:330]

* 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.
  - 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 56 [7.1]
[12.16279]