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 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 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:

In this episode we will walk you though the setting up your project to be added to a source control system.

You will also learn how tricks and techniques that allows anyone to do a pull at anytime and compile on the first try.

Over the last year, there has been a huge increase of interest in using Ruby to create and manipulate music. If you're interested but haven't been pa...

This talk will demonstrate different ways you can use Git in your Ruby applications using Grit, the main binding library for Git in Ruby. A basic ove...

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....