Solving a conflict

pmeunier

Dec 25, 2023, 10:15 PM

YPMGKDPC2ZTBAYKCF57TRLLF6OBHYDHF6LX3KKC35HYEAX2W3XXAC

Dependencies

• [2] FAOGX7G3 Outputting the repo after the last Git import
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [4] HWH4WWN3 Proper separation of Git commit messages into a message and description fields in changes
• [5] GUL4M5FI Cleanup and formatting
• [6] USQMBKTP Replace deprecated chrono function

Change contents

• edit in pijul/src/commands/git.rs at line 763
  [3.159043]→[2.652:751](∅→∅)
  − chrono::NaiveDateTime::from_timestamp_opt(signature.when().seconds(), 0).unwrap(),