volunteerpkgsrc
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
volunteerpkgsrc [2016/03/30 20:09] bleakgadfly [Care to Contribute?] Fixed formatting issues like regular text being interpreted as code |
volunteerpkgsrc [2016/03/30 20:10] (current) bleakgadfly [Maintaining Branches] Made list numbers bold |
||
|---|---|---|---|
| Line 123: | Line 123: | ||
| As upstream changes from the official pkgsrc repository become available, updating your repository allows your changes to merge cleanly in the future. | As upstream changes from the official pkgsrc repository become available, updating your repository allows your changes to merge cleanly in the future. | ||
| - | 1. Update the official branch | + | **1.** Update the official branch |
| <code> | <code> | ||
| Line 131: | Line 131: | ||
| $ make pkgsrc-update | $ make pkgsrc-update | ||
| - | |||
| </code> | </code> | ||
| - | 2. Make your unofficial branch identical to the official one | + | **2.** Make your unofficial branch identical to the official one |
| <code> | <code> | ||
| Line 142: | Line 141: | ||
| $ git rebase minix-master | $ git rebase minix-master | ||
| - | |||
| </code> | </code> | ||
| - | 3. Merge changes from either the official or unofficial branch into your own | + | **3.** Merge changes from either the official or unofficial branch into your own |
| <code> | <code> | ||
| Line 151: | Line 149: | ||
| $ git merge unofficial-minix-master | $ git merge unofficial-minix-master | ||
| - | |||
| </code> | </code> | ||
volunteerpkgsrc.1459361362.txt.gz · Last modified: 2016/03/30 20:09 by bleakgadfly
