pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
Dec 7, 2023, 9:14 AM
QKHCQXOHLG62ISP7ETRP4RH6A3A532BXURNZ3374IUDVML2SK2RQC

Dependencies

  • [2] 6XLI6GUR resolve conflicts
  • [3] AKEXQV6A minor tweaks to manual tests while pushing to all forks
  • [4] KKMFQDR4 editing source code from within the app
  • [5] 2SAJWSNK automatically insert timestamp every time
  • [6] FE25XVZY yet another bugfix to the version check
  • [7] 3XQROLSK redo version checks yet again
  • [8] 57OGXVHZ Merge lines.love
  • [9] 2Y7YH7UP infrastructure for caching LÖVE text objects
  • [10] VPRGENLA hide some details within the 'warning' state
  • [11] Z2VZTIXY redo version checks
  • [12] TG3DFQG5 resolve conflicts
  • [13] 5GHT3LUX copy correct warning message
  • [14] 5XQ4Y7NU reorg manual tests doc
  • [*] OTIBCAUJ love2d scaffold
  • [*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

  • edit in main.lua at line 370
    [4.1581]→[2.322:322](∅→∅)
  • replacement in Manual_tests.md at line 34
    [4.211526]→[2.342:722](∅→∅)
    * run with an untested version. 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. Error message includes message about untested version.
    [4.211526]
    [4.907]
    * 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.
  • edit in Manual_tests.md at line 39
    [4.328]→[2.724:724](∅→∅),[4.211526]→[3.329:586](∅→∅)
    * 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.
  • resolve order conflict in Manual_tests.md at line 39
    [4.328]
    [4.211526]