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:47:03 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=5&rev2=6

  
  Do you fancy helping us with that? [[http://couchdb.apache.org/#contribute|Get in touch!]]
  
+ = Merging =
+ 
+ An actual merge should only be done by the active Release Manager.
+ 
+ Once a merge request has been tested by the community, and you are happy, you can proceed.
+ 
+ == Feature ==
+ 
+ Follow these instructions to merge a feature in to one release branch.
+ 
+ '''@@ BOB, PLEASE FILL IN A LIST OF INSTRUCTIONS, INCLUDING COPY AND PASTE GIT COMMANDS,
HERE.'''
+ 
+ == Bugfix ==
+ 
+ Follow these instructions to merge a bugfix in to multiple release branches.
+ 
+ '''@@ BOB, PLEASE CREATE A LIST OF INSTRUCTIONS, INCLUDING COPY AND PASTE GIT COMMANDS,
HERE.'''
+ 
+ == Security ==
+ 
+ Follow these instructions to generate a patch for unsupported releases.
+ 
+ (Security fixes can be merged in to supported release branches just like bugfixes.)
+ 
+ '''@@ 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