jpayne@68: This is an example of updating the repository with nonconflicting changes.
jpayne@68: 
jpayne@68: First, ensure the correct branch is active: git checkout dev
jpayne@68: Ensure everything looks correct: git status
jpayne@68: Update: git pull origin dev
jpayne@68: Add the new files: git add .
jpayne@68: Commit changes: git commit -m 'changes go here'
jpayne@68: Push: git push origin dev
jpayne@68: Checkout master: git checkout master
jpayne@68: Merge changes: git merge dev
jpayne@68: Ensure everything looks correct: git status
jpayne@68: Tag the new version: git tag -a v38.21 -m 'Version 38.21'
jpayne@68: Push the changes: git push origin master --tags
jpayne@68: Switch back to dev: git checkout dev
jpayne@68: Compiled code (.class files, etc) are ignored in this repo; when Jenkins sees the push, it will recompile everything, using the Eclipse JDK, which produces faster bytecode than Oracle’s.