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 NoahSlater
Date Mon, 07 May 2012 22:58:56 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 NoahSlater:
http://wiki.apache.org/couchdb/Merge_Procedure?action=diff&rev1=7&rev2=8

  Nothing should be committed to a release branch besides what goes through this process.
  
  If we all follow this, it will improve our code quality, test coverage, and documentation.
+ 
+ = Feature Branches =
+ 
+ Most work should happen in feature branches.
+ 
+ If there is not already a ticket for your work, please create one.
+ 
+ == Naming ==
+ 
+ Please use the ticket number, along with a very short descriptive phrase, for your branch
name.
+ 
+ If the ticket was COUCHDB-1234, and the ticket title was My Cool Feature, your branch should
be called `1234-cool`.
+ 
+ == Git Best Practice ==
+ 
+ '''@@ BOB, PLEASE LET ME KNOW IF YOU WANT A DIAGRAM MAKING FOR THIS SECTION.'''
+ 
+ '''@@ BOB, PLEASE CREATE A LIST OF RECOMMENDATIONS. TO SQUASH OR NOT TO SQUASH?'''
+ 
+ '''@@ BOB, PLEASE CREATE A LIST OF INSTRUCTIONS, INCLUDING COPY AND PASTE GIT COMMANDS,
HERE.'''
  
  = Merge Request =
  
@@ -151, +171 @@

  
  '''@@ BOB, PLEASE CREATE A LIST OF INSTRUCTIONS, INCLUDING COPY AND PASTE GIT COMMANDS,
HERE.'''
  
- = Feature Branches =
- 
- Most work should happen in feature branches.
- 
- If there is not already a ticket for your work, please create one.
- 
- == Naming ==
- 
- Please use the ticket number, along with a very short descriptive phrase, for your branch
name.
- 
- If the ticket was COUCHDB-1234, and the ticket title was My Cool Feature, your branch should
be called `1234-cool`.
- 
- == Git Best Practice ==
- 
- '''@@ BOB, PLEASE LET ME KNOW IF YOU WANT A DIAGRAM MAKING FOR THIS SECTION.'''
- 
- '''@@ BOB, PLEASE CREATE A LIST OF RECOMMENDATIONS. TO SQUASH OR NOT TO SQUASH?'''
- 
- '''@@ BOB, PLEASE CREATE A LIST OF INSTRUCTIONS, INCLUDING COPY AND PASTE GIT COMMANDS,
HERE.'''
- 

Mime
View raw message