Version Control with Git & GitHub

Belén Albeza@ladybenko

1. Version control

What is version control?

What is version control?

It’s the management of changes

version 1 version 2 version 3

• A version control system stores the increments between versions

• So we can check the evolution of our document set

• And we can roll back to any previous state

• We can code without fear of screwing up and not being able to go back to a stable estate

• We can track the changes and locate where we introduced that new nasty bug

• We can share different versions of our code

Why is this useful?

But there’s more...

But there’s more...

Collaborative development

We can share changes between developers

Pics from pixelblock.tumblr.com

• Several people can work in the same code, remotely

• You can work on your code from multiple machines

• Version control makes integrating changes easy

This is great!

II. Brief intro to Git

Git

“Git is an extremely fast, efficient, distributed version control system ideal for the collaborative development of software”

from GitHub.com

GitHub

GitHub provides free public Git repositories, so your code will be online. It

also provides a graphic Git client!

www.github.com

Create a repo (1)

Create a repo (2)

Make some changes

Commit your changes

Make some more changes and commit

again

Check history

Check history

Check history

Check history

Push your changes to GitHub

Push your changes to GitHub

Push your changes to GitHub

Flow

Init repo

Change code

Commit changes

Sync

To continue from here...

• Setup instructions: http://help.github.com/articles/set-up-git

• Learn how to solve conflicts

• Get to know about Git philosophy on branches

• Get a shell!

Thanks!

?