[Couchdb Wiki] Update of "Merge_Procedure" by NoahSlater

[Apache Wiki <wi...@apache.org>]

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=12&rev2=13

  Developers are free to use a feature branch in any way they see fit during development. Prior to submitting a merge request to dev@, though, the branch should be prepared according to the following rules, as the commits on the feature branch will be a permanent part of the couchdb project's history.
  
  A feature branch should consist of the smallest number of meaningful commits as possible. For bug fixes and small features, this is likely to be a single commit. For larger changes, multiple commits might be necessary. The guiding principle for deciding how many commits is coherence. A commit should be readable and, ideally, implement one distinct idea. A feature that requires multiple enhancements to achieve its goal should be presented as multiple commits. It is *not* necessary for the system to pass the test suite for any subset of these commits, only their combination.
- 
- 
- '''@@ 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.'''