zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes merge conflict

This commit is contained in:
Josh Cincinnati 2019-04-09 23:34:15 +00:00
parent bb306ec6b3 159d1a6976
commit c7cd1904da
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zip-0000.rst
View File

@ -4,8 +4,8 @@
Title: ZIP Process
Owners: Daira Hopwood
Josh Cincinnati
Status: Draft
Type: Process
Status: Active
Category: Process
Created: 2019-02-16
License: BSD-2-Clause
@ -145,7 +145,8 @@ be selected by consensus among the current Editors.
ZIP Editor Responsibilities & Workflow
--------------------------------------
The ZIP Editors subscribe to the Zcash Community Forum.
The ZIP Editors subscribe to the `Zcash Community Forum.
<https://forum.zcashcommunity.com/>`__
For each new ZIP that comes in an Editor confirms the following:
@ -164,12 +165,13 @@ revision, with specific instructions.
Once the ZIP is ready for the repository it should be submitted as a
"pull request" to the `ZIPs git repository <https://github.com/zcash/zips>`__
where it may get further feedback.
where it may get further feedback. It should not contain a ZIP number,
and should be labelled "WIP" in the pull request.
The ZIP Editors will:
* Assign a ZIP number in the pull request.
* Merge the pull request when it is ready.
* Merge the pull request when it is ready and remove the "WIP" label.
The ZIP editors monitor ZIP changes and update ZIP headers as
appropriate.
@ -330,8 +332,8 @@ that requires more than one file, all of the files SHOULD be in a
subdirectory named zip-XXXX.
ZIP types
=========
ZIP categories
==============
There are several kinds of ZIP: