Skip to content

Latest commit

 

History

History
56 lines (49 loc) · 2.57 KB

git-outline.md

File metadata and controls

56 lines (49 loc) · 2.57 KB

Git and Version Control

Setup

  1. Make sure you have git installed. If not brew install git on iOS, apt install git on Linux or visit Official Git website
  2. Make sure you have a GitHub account: GitHub website
  3. Download GitKraken: GitKraken
  4. (Optional) Register for a GitHub Student Developer Pack which also gives a GitKraken Pro licence.

Part 1

Objectives

  1. Understand what Git is and what it is used for.
  2. Use Git with a local repository.
  3. Be familiar with the following commands:
    1. init
    2. add
    3. commit
    4. checkout
    5. revert
    6. diff
    7. merge
    8. log
  4. Be familiar with the following ideas:
    1. Repo
    2. History, stage/index, working directory
    3. Commit hash, commit object
    4. Head
    5. Branch

Plan

  1. LAB: overview of Git - Intro to Git Basics (Adapted from shacon)
  2. Individual work: Software carpentry course units 2 - 6 only: Git - SoftwareCarpentry

Part 2

Objectives:

  1. Understand a what a remote repository is.
  2. Understand how to collaborate with others.
  3. Fix conflicts.
  4. Use GitKraken to manage your repositories and remotes.
  5. Understand the following commands:
    1. clone
    2. fetch
    3. pull
    4. push

Plan

  1. LAB: overview of collaboration and remotes Intro to Git Remotes (Adapted from shacon)
  2. Individual work: Software carpentry course units 7 - 9: Git - SoftwareCarpentry
  3. Individual work: GitKraken tutorial (Video and navigate sidebar: GitKraken->Start Here)

Resources:

  1. Visual guide to branches: Branches (Focus on first eight main exercises and first 10 remote.)
  2. Official Git documentation: Git docs
  3. Useful Git tutorial: Atlassian tutorial
  4. Visual Git
  5. Git-flow - How to manage branches in a real project: GitFlow, and where it comes from: How to do branches properly.