Glossary

Key Points

Introduction and setup	This is not a lecture The more you engage the more you will benefit Everyone is here to learn and that means making mistakes
Scientific Computing	Scientific computing has different goals from computer science and software engineering You are a scientist, your focus is on the science Automation can occur at many levels Reproducibility is good for everyone (especially you)
Best Practices In Scientific Computing	Validation is testing Documentation benefits everyone (especially you) Version control will save you time and effort
Managing Data	Invest time in cleaning and transforming your data Meta data gives context and makes your data easier to understand How and where you store your data is important
Project Management	Project and time management is key to success Many tools exist, find one that works for you and stick with it You PhD project is your’s for the taking
Bonus Content	there is always more to learn

ADACS: Astronomy Data And Computing Services. For more info see adacs.org.au
ASA: The Astronomical Society of Australia
HWSA: The Harley Wood School for Astronomy

A printable Git cheatsheet is available here. More material is available from the GitLab basics guides website.
An interactive one-page visualisation about the relationships between workspace, staging area, local repository, upstream repository, and the commands associated with each (with explanations).
Learning git branching is an interactive tutorial, covering remotes, branching, merging, rebase and more

changeset: A group of changes to one or more files that are or will be added to a single commit in a version control repository.
commit: To record the current state of a set of files (a changeset) in a version control repository. As a noun, the result of committing, i.e. a recorded changeset in a repository. If a commit contains changes to multiple files, all of the changes are recorded together.
conflict: A change made by one user of a version control system that is incompatible with changes made by other users. Helping users resolve conflicts is one of version control’s major tasks.
merge: (a repository): To reconcile two sets of changes to a repository.
repository: A storage area where a version control system stores the full history of commits of a project and information about who changed what, when.
revision: A synonym for commit.
version control: A tool for managing changes to a set of files. Each set of changes creates a new commit of the files; the version control system allows users to recover old commits reliably, and helps manage conflicting changes made by different users.