...
- Get the repository:
Code Block git clone git@github.com:fcrepo/fcrepo.git cd fcrepo
- Create the branch where you'll do your work:
Code Block git branch fcrepo-780 git checkout fcrepo-780
Thecheckout
command makes whatever branch you specify the local active branch. Make your changes, test... - Add your edited/new files, then commit your branch:
Code Block git add myfile.java git commit myfile.java
- If you're working on a branch for some time, you may want to update your branch with the latest changes to master:
Code Block Push the branch back up to githubgit fetch origin master git merge origin/master
Code Block git push origin fcrepo-780
- Merge the branch into Check out master (formerly known as 'trunk'), make sure it's Git Quick Start Guide:
Make sure it's Git Quick Start Guide.Code Block git checkout master
- Merge the branch into master (formerly known as 'trunk')
Resolve any conflicts, and test again.Code Block master git merge fcrepo-780
- Update master on github:
Code Block git push origin master
- Once you've received word that the build has completed correctly, delete the branch
Code Block git push origin :fcrepo-780
...