In this episode you will learn how to use Subversion to create and apply patches.

We will walk you though two different ways to do this and explain the pros and cons of each way.

In this episode we walk though how to resolve code conflicts using the TortoiseSVN client.

By the end of this episode you should be able to use both the Diff and Merge tools that are built into TortoiseSVN to manage and resolve any code conflicts that may arise

In this episode we will walk you though how to setup and add your project to the Subversion (SVN) source control server.

We will be using the VisualSVN Server and TortoiseSvn Client in this episode. By the end of this episode you should be able to setup, maintain and use a SVN server with ...

In this episode we will walk you though the various steps that make up the Check-in Dance. The steps of the check-in dance are below:

This episode goes over some of the common or interesting options to 'git diff', showing how to see what has changed between your last commit and your staged files, unstaged files, all changed files or another commit. We also demonstrate how to create and apply patchfiles and how to view changed file ...

This episode shows how to add other git projects as submodules to your own, how to update them in your project and how to keep up to date with them in another developers project. It also, as a side note, shows how to develop a simple ruby web application on Rack

This episode of GitCasts demonstrates how to setup mSysGit on Windows and goes through some basic workflow using the Windows Git version, in an attempt to partially dispel rumors that Git is unsupported or difficult to get going on Windows. I assume previous knowledge of Git here - this just shows yo...

I've been getting a lot of feedback on the talk that I gave at RailsConf 2008 and a number of people have requested that I do a voiceover of the slides, so here you go. It's not quite as lively as in person, as I gave the talk at 6:30 in the morning in my living room to my cats, but you get the idea....

This screencast demonstrates how to create empty branches in Git - that is, branches that are not derivatives of your main branches, but entirely new projects. In the screencast, I create an empty branch to store the website code in for my project, so I don't have to store it as a subdirectory of my ...

This screencast demonstrates a distributed workflow. It takes two personas, creating a project in GitHub and pushing to it in the first persona, then cloning that project in the second. The second sets up a public, read-only HTTP repository on his own server. The first then fetches from that, merges ...

This screencast follows roughly the same course as the previous one on branching and merging, only I replace merging with rebasing. This screencast also demonstrates the interactive rebase command git rebase -i. I also demonstrate some slightly more complex branching, by using both interactive and no...

In this screencast, we take you through a workflow where we branch, stash and merge several times. It demonstrates the branch and show-branch commands, how to switch branches, how to stash changes, how to list and apply stashes, how to resolve conflicts, how to create and delete topic branches, and w...