Solving a conflict

pmeunier

Aug 3, 2021, 4:33 PM

TQOZXRKL57XPAAKHP5WHEUUUTKEIFXIZRYO6XGO6EIOYPUN2RROAC

Dependencies

• [2] JSSEYW7N Solving a conflict (this was a double conflict, actually)
• [3] VO5OQW4W Removing anyhow in libpijul
• [4] 7FFFKQZU add 'Default' implementations
• [5] UEWNF7X3 Detecting "self-solving" zombie folder (or file) conflicts
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in libpijul/src/missing_context.rs at line 234
  [3.26882]→[2.0:0](∅→∅)
  −