[GitHub] keith-turner edited a comment on issue #818: Fix #810

[GitBox <gi...@apache.org>]

keith-turner edited a comment on issue #818: Fix #810
URL: https://github.com/apache/accumulo/pull/818#issuecomment-451468213
 
 
   @jzgithub1 I am closing this pull request because it contains change for multiple unrelated things.  I merged the changes you made for #807, so that is done.  I looked into merging the changes for #810 however those changes are not ready and still need work. I have not looked at the changes for  #849,  I can look at those when they are in a separate PR.
   
   In order to create multiple PRs you need to create multiple branches locally, push those branches to your fork, and then create a PR. You should also base your local master branch on upstream apache accumulo.  Below are the commands that I would execute to create multiple PRs AND get your master branch in a good state.  I have not tested these commands.  Let me know if you have any questions.
   
   ```bash
   # locally make sure you are on your master branch, which seems to be where all of your changes are
   git checkout master
   # create a branch with a backup of the master commits
   git checkout -b master-backup
   # esnsure your commit are there
   git log
   # ensure you are on the master-backup branch
   git status
   
   # switch back to the master branch
   git checkout master
   # add a remote named upstream for apache/accumulo
   git remote add upstream https://github.com/apache/accumulo.git
   # look at the remotes you have configured
   git remote -v
   # reset your local master branch to be the same as apache/accumulo master branch
   git reset --hard upstream/master
   git checkout .
   # the following command should show things are clean (no changed files)
   git status
   # make your local master branch pull change from apache/accumulo master.  Usually you would not 
   # commit directly to your local master branch
   git branch --set-upstream master upstream/master
   # the following command should pull the latest changes from apache/accumulo
   git pull
   # create a branch called accumulo-810 based on master 
   git checkout -b accumulo-810
   # patch your changes to MiniAccumuloClusterImpl.java from the master-backup branch.  Only
   # accept the changes you made.  Since you forked this file has changed, so you are patching in an older 
   # version of the file.  So do not patch in older code that had been changed.
   git checkout --patch master-backup minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
   # Diff the accumulo-810 branch with master, should only see the changes you made
   git diff master
   git commit -am "some message"
   # The command below assumes origin is the remote for your fork of Accumulo.  It will push your branch.
   git push -u origin accumulo-810
   # after pushing go to the github website and create a PR
   
   # You need to create another PR for #849.  Below are some commands for that.
   # make sure your master branch is up to date
   git checkout master
   git pull
   # create a branch for the PR off of master
   git checkout -b accumulo-849
   # patch in your changes from the master-backup branch
   git checkout --patch master-backup core/src/test/java/org/apache/accumulo/core/client/summary/CountingSummarizerTest.java
   # compare diffs with master
   git diff master
   git commit -am "some message"
   # if good, then push and make another PR
   git push -u origin accumulo-849
   
   # If you need to make changes to either PR, then checkout that branch, edit, commit, and then push.
   # Below is an example of this
   git checkout accumulo-810
   # edit a file and commit
   git commit -am "some message"
   git push
   # should see the commit on the PR
   ```
   
   
   
   
   
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services