...
- Get the repository:
Code Block |
---|
git clone git@github.com:fcrepo/fcrepo.git
cd fcrepo |
or Code Block |
---|
git clone http://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 |
The checkout
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 |
---|
git fetch origin master
git merge origin/master |
.
- Push the branch back up to github
Code Block |
---|
git push origin fcrepo-780 |
- Merge the branch into Check out master (formerly known as 'trunk'):
Code Block |
---|
git checkout master |
Make sure it's current.
- Merge the branch into master (formerly known as 'trunk')
Code Block |
---|
master
git merge fcrepo-780 |
Resolve any conflicts, and test again.
- 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 |
...
Anchor |
---|
| mergeupstream |
---|
| mergeupstream |
---|
|
h3. Examining and merging in upstream changes
If any time has passed since you began working on your local branch, make sure that you also merge any upstream changes to master into your local copy before pushing your changes back up:
...