pijul/manual - Change CA6HDDRXHHTP4OTMSGI6L7DNQS2XLF5UNBR52TBM4ST6VK5BNXKAC

Solving conflicts

Created by pmeunier on November 27, 2020

CA6HDDRXHHTP4OTMSGI6L7DNQS2XLF5UNBR52TBM4ST6VK5BNXKAC

Dependencies

In channels

main

Change contents

Solving an order conflict in src/theory.md at line 99 [4.10059]
[2.6814]
[3.210]

Deletion in src/the_nest/contributing.md at line 7 [4.19393]

B:BD[4.19691] → [3.327:572]

∅:D[3.572] → [4.19940:19941]

∅:D[2.13938] → [4.19940:19941]

B:BD[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.19393]
B:BD[4.19945] → [2.13939:13980]
B:BD[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.19393]

B:BD[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:

Deletion in src/the_nest/contributing.md at line 16 [4.19393]

B:BD[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.