Page History

...

1. Get the repository:

   Code Block
   git clone git@github.com:fcrepo/fcrepo.git cd fcrepo

2. Create the branch where you'll do your work:

   Code Block
   git branch fcrepo-780 git checkout fcrepo-780

   
   The checkout command makes whatever branch you specify the local active branch. Make your changes, test...
   
   
3. Add your edited/new files, then commit your branch:

   Code Block
   git add myfile.java git commit myfile.java

4. Graft your changes (and commit histories) onto the end of master:

   Code Block
   git rebase master

   You may need resolve conflicts, then re-add and re-commit the merged files. If this is the case, you can pick up where you left off with the command git rebase --continue.
   The command git rebase -i master allows you to interactively edit, suppress, combine the commits in your branch, to eliminate non-useful or trivial commit messages in the final result.
   
5. Switch to the master branch, update it to the latest version:

   Code Block
   git checkout master git pull

6. Merge in the changes from your unpublished, rebased branch:

   Code Block
   git merge fcrepo-780

   
   Merges are automatically committed locally.
   
   
7. Update master on github:

   Code Block
   git push origin master