Fix conflicts

dblsaiko

Mar 30, 2024, 8:49 PM

S2MX3SDA26V352HJSOKTI5RURVAUSELRBB4HREFGTQPKLNRSOC4AC

Dependencies

• [2] 42MFQSMS Require at least one path for file operations
• [3] 3WADZG36 Refactor file operation commands' handling of repo and channel
• [4] PIQCNEEB Upgrading to Clap 3.0.0-alpha.5
• [5] RG4YZPKL file_operations: remove the counter-intuitive --repository options
• [6] AEPEFS7O Write help for each argument
• [7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in pijul/src/commands/file_operations.rs at line 206
  [4.172507]

  [2.60]
  + #[clap(flatten)]

  + base: RepoPath,
• edit in pijul/src/commands/file_operations.rs at line 210
  [4.172507]→[3.372:413](∅→∅),[4.172507]→[3.372:413](∅→∅)
  − #[clap(flatten)]

  − base: RepoPath,
• resolve order conflict in pijul/src/commands/file_operations.rs at line 210
  [2.117]

  [4.172572]