Version control with Git: Version control with Git and GitHub

Version control with Git and GitHub

  1. Open the notes at http://gcapes.github.io/git-course/
  2. Make sure you’ve completed all the setup steps at https://gcapes.github.io/git-course/setup.html

Research-related IT services

Course timing

Teaching methods

Getting help

What is a version control system?



Storing versions without VCS



Why use version control

To store versions properly


Changes are saved sequentially


Different versions can be saved

Drawing


Multiple versions can be merged

Drawing

Why use version control?

Before we get started

Check setup was a success

ssh -T git@github.com
Hi yourusername! You've successfully authenticated, but GitHub does not provide shell access.

Open the notes

https://gcapes.github.io/git-course


Why learn the commands?


The staging area


Exercise 1

Create your own repo

http://gcapes.github.io/git-course/03-history


Switching to a previous commit: “detached HEAD”


Branches


Three exercises on branching

http://gcapes.github.io/git-course/06-branching/


Revert

Create a new commit

Reset

Delete commit(s)

Exercises on remote collaboration

https://gcapes.github.io/git-course/10-remote-collaboration

 

Feedback form

Rebasing

Merge vs rebase

Standard merge

Rebase onto master

(FF) merge after rebase

Forks and Pull Requests

Send me a PR!

https://gcapes.github.io/git-course/13-pull-requests/#send-me-a-pull-request