Solving a conflict (this was a double conflict, actually)
[?]
Dec 7, 2020, 4:43 PM
JSSEYW7NUUB5S2T6GPXOHECHZ5JY3KG3AT2IPSWCVIPUDHOBNZQACDependencies
- [2]
VO5OQW4WRemoving anyhow in libpijul - [3]
HMMMKONLFixing alive vertices - [4]
7FFFKQZUadd 'Default' implementations - [*]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting).
Change contents
- resolve order conflict in libpijul/src/missing_context.rs at line 323
- resolve order conflict in libpijul/src/apply.rs at line 544