Git Basics

Note

This section is only relevant for future developers to the CSC-ATAMO Dusty project.

This section will not go into the details of git, there are better tutorials online that can be read.

This tutorial will be tailored for this project.

Setup

With git installed on your system, clone the repo;

$ git clone https://github.com/kjph/c7c-atamo-dusty.git
$ cd c7c-atamo-dusty

Workflow

The workflow used for this project will be basic. Despite this, it is still recommended to read up on the basic git workflows.

A daily build process is provided below:

  1. git pull to update your local repository with the Github repository

  2. Merge any conflicting changes if required (or ask a more senior dev.)

  3. git log to review changes to ensure you’re up to speed and understand the changes

  4. Make your local changes;

    1. git add to stage changes
    2. git commit to save changes into your local repository

  5. git push to ensure your local repository is the same with the server repository (update refs)

  6. Repeat

Git Theory

git rookies often wonder why there are three different commands (add, commit, push) which all sound like they do the same thing.

They don’t (obviously).

Recommended reading to clear-up these: