Solving a conflict (this was a double conflict, actually)

[?]
Dec 7, 2020, 4:43 PM
JSSEYW7NUUB5S2T6GPXOHECHZ5JY3KG3AT2IPSWCVIPUDHOBNZQAC

Dependencies

  • [2] VO5OQW4W Removing anyhow in libpijul
  • [3] HMMMKONL Fixing alive vertices
  • [4] 7FFFKQZU add 'Default' implementations
  • [*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

  • resolve order conflict in libpijul/src/missing_context.rs at line 323
    [2.26882]
    [4.602]
  • resolve order conflict in libpijul/src/apply.rs at line 544
    [3.1052]
    [4.674]