Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. Get the repository:
    Code Block
    git clone git@github.com:fcrepo/fcrepo.git
    cd fcrepo
    or
    Code Block
    git clone httpshttp://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. If you're working on a branch for some time, you may want to update your branch with the latest changes to master.

  5. Push the branch back up to github
    Code Block
    git push origin fcrepo-780
  6. Check out master (formerly known as 'trunk'):
    Code Block
    git checkout master
    Make sure it's current.

  7. Merge the branch into master (formerly known as 'trunk')
    Code Block
    git merge fcrepo-780
    Resolve any conflicts, and test again.

  8. Update master on github:
    Code Block
    git push origin master
  9. Once you've received word that the build has completed correctly, delete the branch
    Code Block
    git push origin :fcrepo-780

...