couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Couchdb Wiki] Update of "Merge_Procedure" by JanLehnardt
Date Thu, 21 Jun 2012 15:47:02 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Couchdb Wiki" for change notification.

The "Merge_Procedure" page has been changed by JanLehnardt:
http://wiki.apache.org/couchdb/Merge_Procedure?action=diff&rev1=9&rev2=10

Comment:
refine a few points, add links

  
  Most work should happen in feature branches.
  
- If there is not already a ticket for your work, please create one.
+ If there is not already a ticket for your work, please[[https://issues.apache.org/jira/browse/COUCHDB
| create one]].
  
  == Naming ==
  
@@ -60, +60 @@

  
  If you want to make a merge request, please follow these steps:
  
+  * Prepare your code on a feature/bugfix branch.
-  * Prepare your code.
- 
-    * Preferably on a feature branch, but master is okay too.
  
   * Add any new tests that cover your code.
  
@@ -72, +70 @@

  
   * Run `make distcheck` a few times and verify that it works reliably.
  
-  * Send an email to [[http://mail-archives.apache.org/mod_mbox/couchdb-dev/|couchdb-dev]]
mailing list
+  * Send an email to [[http://mail-archives.apache.org/mod_mbox/couchdb-dev/|couchdb-dev]]
mailing list. [[http://wiki.apache.org/couchdb/Merge_Request#preview | You can use this template]].
  
     * Choose a subject like "[MERGE] Feature description"
  
@@ -82, +80 @@

  
     * Does `make distcheck` work reiably? If not, start over.
  
-    * Ask people to check your code, and cast a vote.
+    * Ask people to check your code.
  
   * Wait 72 hours for a lazy consensus.
  

Mime
View raw message