accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject svn commit: r1624175 - /accumulo/site/trunk/content/git.mdtext
Date Thu, 11 Sep 2014 00:41:13 GMT
Author: elserj
Date: Thu Sep 11 00:41:13 2014
New Revision: 1624175

URL: http://svn.apache.org/r1624175
Log:
Add message about not signoff'ing pull-requests. Update some formatting

Modified:
    accumulo/site/trunk/content/git.mdtext

Modified: accumulo/site/trunk/content/git.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/git.mdtext?rev=1624175&r1=1624174&r2=1624175&view=diff
==============================================================================
--- accumulo/site/trunk/content/git.mdtext (original)
+++ accumulo/site/trunk/content/git.mdtext Thu Sep 11 00:41:13 2014
@@ -20,14 +20,7 @@ Notice:    Licensed to the Apache Softwa
 [Git](http://git-scm.com) is an open source, distributed version control system
 which has become very popular in large, complicated software projects due to
 its efficient handling of multiple, simultaneously and independently developed
-branches of source code.
-
-# The plan
-
-There are multiple steps that are required of us to fully transition from
-active development against Subversion to Git. Each of these requires consensus
-(lazy or not) from the team along with documentation that developers, both
-existing and current, can reference to understand how and what to do.
+branches of source code.\
 
 
 ## Workflow Background
@@ -230,7 +223,9 @@ Contribution under the [Apache License](
 When pulling the code, committers should also verify that the commits pulled match the 
 list of commits sent to the Accumulo dev list in the pull request.
 
-**Patches** -- Developers should use the following steps to apply patches from
+#### Patches
+
+Developers should use the following steps to apply patches from
 contributors:
 
 1. Checkout the branch which the patch is submitted for:
@@ -257,7 +252,9 @@ contributors:
 
     `git checkout master && git merge 1.5.1-SNAPSHOT`
 
-**Pull-Requests** -- If the contributor submits a repository and branch to pull
+#### Pull-Requests
+
+If the contributor submits a repository and branch to pull
 from, the steps are even easier:
 
 1. Add their repository as a remote to your repository
@@ -280,7 +277,10 @@ If the branch doesn't fast-forward merge
 contributor to update their branch to avoid the conflict resolution and merge
 commit. See the [Git
 manual](http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging)
-for more information on merging.
+for more information on merging. When merging a pull-request, it's best to **not**
+include a signoff on the commit(s) as it changes the final commit ID in the
+Accumulo repository. This also has the negative of not automatically closing
+the Pull-Request when the changes are made public.
 
 ### Feature Branches
 



Mime
View raw message