Coding Conventions

• Use 2 space indents
• NO tabs - anywhere
• try not to leave trailing whitespace
• prefer parentheses around method arguments - ESPECIALLY when the argument list has more than one argument.
• Optimize your code for READABILITY first.
• always put whitespace between successive elements of a list (e.g. argument list, array)

Version Control with Git

• Commit locally very often - you can always rearrange it later.
• 'master' is the integration branch - try hard not to push anything there that would impede other developers' progress.
• Before committing - either rebase your commits on top of the remote branch, or have a good reason to do a merge.
• Keep your commits logically small and discrete.