Solving a conflict

pmeunier
Feb 22, 2022, 8:02 AM
IRTEAQQTYTF5UQ7BDMKKSA4HQFL3AHQ6B2ACDWFNTGMXTHABBPUQC

Dependencies

  • [2] W6JWQQRQ nest.pijul.com -> ssh.pijul.com
  • [3] Y5IZKFOR Fix links and remove _org
  • [4] NAGZ27WJ update ssh remotes from nest.pijul.com to ssh.pijul.com
  • [5] SCSV2FNS Reboot

Change contents

  • edit in src/working_with_others.md at line 64
    [3.1702][2.0:37]()
    pijul clone me@ssh.pijul.com:me/repo
  • edit in src/working_with_others.md at line 70
    [3.1778][2.38:74]()
    pijul push me@ssh.pijul.com:me/repo
  • edit in src/working_with_others.md at line 77
    [3.1951][2.75:111]()
    pijul pull me@ssh.pijul.com:me/repo