Solving conflicts

Dependencies

• [2] GLUD3ZVF Generating the reference
• [3] Y5IZKFOR Fix links and remove _org
• [4] SCSV2FNS Reboot

Change contents

• resolve order conflict in src/theory.md at line 99
  [2.6814]

  [3.210]
  +
• edit in src/the_nest/contributing.md at line 7
  [4.19691]→[3.327:572](∅→∅),[3.572]→[4.19940:19941](∅→∅),[2.13938]→[4.19940:19941](∅→∅),[4.19940]→[4.19940:19941](∅→∅)
  − In practice, contributing to a project on the Nest is as simple as opening a new discussion (using the web interface), and pushing to that discussion. For instance, pushing a patch to discussion 29 of repository `pijul/pijul` can be done using:

  −
• replacement in src/the_nest/contributing.md at line 8
  [4.19945]→[2.13939:13980](∅→∅),[4.19945]→[3.573:629](∅→∅)
  − pijul push me@nest.pijul.com:pijul/pijul

  − pijul push m@nest.pijul.com:pijul/pijul --to-branch :29
  [4.19945]

  [4.20005]
  + pijul push m@nest.pijul.com:pijul/pijul
• replacement in src/the_nest/contributing.md at line 11
  [4.20010]→[2.13981:14114](∅→∅)
  − Where `me` is your own user account. If you are the owner of the repository, you can use the same syntax, or the following shortcut:
  [4.20010]

  [2.14114]
  + If you are the owner of the repository, you can use the same syntax, or the following shortcut:
• edit in src/the_nest/contributing.md at line 16
  [4.20010]→[3.630:807](∅→∅)
  − If this is the first time someone pushes a patch to discussion 29, this forks branch "master" of repository `pijul/pijul`, and pushes the patches from the local branch onto it.