Branches in Git without merging would be like basketball without the hoop—fun, sure, but with very little point. In this video you’ll learn how you can use merging to combine the work on multiple branches back into one.
RW Team Member
Sam is a strange mashup of developer, writer and trainer. By day you'll find him recording videos for Razeware, writing tutorials, attending conferences and generally being a good guy. By night he's likely to be out entertaining people, armed with his trombone and killer dance moves.
He'd like it very much if you were to follow him on twitter at @iwantmyrealname, seek him out as sammyd on GitHub, or check his personal site iwantmyreal.name.
The real power in Git comes from its branching and merging model. This allows you to work on multiple things simultaneously. Discover how to manage branches, and exactly what they are in this next video.
There’s very little point in creating a nice history of your source code if you can’t explore it. In this video you’ll discover the versatility of the git log command—displaying branches, graphs and even filtering the history.
Sometimes, there are things that you really don’t want to store in your source code repository. Whether it be the diary of your teenage self, or build artifacts, you can tell Git to ignore them via the gitignore file.
Before you can create a Git commit, you have to use the “add” command. What does it do? Discover how to use the staging area to great effect through the interactive git add command.
A Git repo is made up of a sequence of commits—each representing the state of your code at a point in time. Discover how to create these commits to track the changes you make in your code.
Code, like team sports, is meant to be shared with other people. Discover how you can create a remote for your new Git repo, and push it to GitHub for all your friends to enjoy.
If you are starting a new project, and want to use Git for source control, you first need to create a new repository. Learn how you can get started initialising a new Git repository, and then look at some conventions that all code repos should adopt.
This video course is designed to take you from knowing very little about git all the way through to being able to experience the benefits of source control every single day. You will focus on real-world processes, and learn everything from cloning and creating repos, through committing and ignoring files, to managing remotes and pull requests.
One of the ways you might start out with git is by creating your own copy of somebody else’s repository. Discover how to clone a remote repo to your local machine, and what constitutes “forking” a repository.