mirror of https://github.com/zcash/zips.git
fixes merge conflict
This commit is contained in:
commit
c7cd1904da
16
zip-0000.rst
16
zip-0000.rst
|
@ -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:
|
||||
|
||||
|
|
Loading…
Reference in New Issue