What is version control?
Version control is a way to manage and track any changes you make to your files. If you’ve been using online services such as Google Docs or Wikipedia, then you’ll already have been working with documents and pages that use a version control system.
Google docs revision history
Google docs, for example, keeps a revision history of any document you create and modify.
Have a look at this Google document.
- Select to see the revision history (you must be logged in with your Google account to do that!)
- And the more detailed version
Scroll through the revisions, from the bottom up. You should be able to see each set of changes highlighted in green.
Wikipedia page history
Wikipedia also holds a history of all changes.
- Go to this document
- Click view history
- Try and have a look at the first revision of the page, by going back. It’s dated back to 2005!
- Click curr, that will show you the differences between the first and the latest entry
Why do you need Version Control?
- When used on a regular basis, version control helps you to store your files safely. It makes it easy to figure out what broke your code, as you can roll back to a previous version and work out when things last worked as expected.
- With no version control in place you’ll only have one copy of your file, then when it breaks there’s no way to get back to good code!
- It is also helpful when working with other people as it combines all the changes together and tracks who, why and when it changed.
- In the work environment this may be essential to know for example, what issue the change fixes or customer requirement it relates to.
Code version control systems
There are a number of different version control systems. The most popular ones are svn (or Subversion), cvs, Mercurial and Git.
We will be using Git.
There are a number of reasons we chose Git, namely;
A lot of learning resources are publicly available
Does not require you to be connected to the internet to use
All your tracked changes stay on your machine until you are happy with them, and want to make them part of your codebase
Will tell you if someone has made changes since you last pushed code and urge you to update first and resolve issues
Github and online collaboration. Open source code is a big part of today’s life. By being able to retrieve and help existing projects, you can also contribute to them
Some popular projects using Git:
A bit more about Git
As with any technology and related tool, there’s a lot of terminollgy used. Here’s some of the most common terms and their definitions:
Repository: A repository is where code is stored
Checkout: When you retrieve code from a repository, to you local machine
Commit: Applying any changes you have made to the repository
Aim for small and focused changes
When using version control, you should commit every time you do a small piece of work, rather than working for hours in a row, changing too many things and then committing them is a great way to introduce issues that are hard to track down.
For example, if you want to change the position of an element, the colour of all the links on your page and the font size dimensions of all paragraphs, you should do three commits, using messages that describe what you are doing each time.
Write meaningful commit messages
Every time you commit a change use a message that describes your change clearly. In a few months time you will have difficulty remembering why you applied a change if your messages say changing some CSS, another commit or more changes
Try using messages such as repositioned image to look better on page or resolved positioning issue for Firefox.
The next step!
Sign up to Github
Download Github Desktop (for Mac or Windows).
Now that you have the Github client setup on your machine, we will spend some time adding what you have created in the HTML & CSS lessons to an internet repository! Before you start make sure the Github client is running and you are signed in.
Create a new repository by clicking the
Create New Repositorybutton
In your text editor, open the directory you just created and create a README.md file with the following content:
This is where I store the work I have done at codebar.
Go back to the Github client and commit the file by filling out the
Summaryfield and hitting the
Commit to masterbutton
Now, create a new branch called gh-pages
In the directory, create a subdirectory lesson1 and move the html file you created at the first session and all the other relevant files and directories (e.g. /images)
Now, link the file from the root of your project by creating an
index.htmlfile and adding a link to the page
<a href='lesson1/index.html'>Lesson 1 - Introduction to HTML </a>
Don’t forget to rename index to whatever you have named your file!
Commit your changes to the gh-pages branch
Once you committed your changes publish your work by clicking the
View your work on the web!
To access your work, go to
Repeat the process to list the rest of the tutorials you have worked on on the page as well.
This is your personal page. Use what you learned in the previous lessons to style it, make it look pretty, and what we learned today to commit and publish your changes.
This ends our Introduction to version control and git lesson. Is there something you don’t understand? Try and go through the provided resources with your coach. If you have any feedback, or can think of ways to improve this tutorial send us an email and let us know.