Git vs SVN comparison

Version 11 (kju, 04/27/2009 19:18)

1 1 kju
h1. Git vs SVN comparison
2 1 kju
3 1 kju
{{toc}}
4 1 kju
5 1 kju
h2. Summmary
6 1 kju
7 1 kju
Overall SVN easier to get into and is more accessible due to the
8 1 kju
excellent app called "TortoiseSVN":http://tortoisesvn.tigris.org/ (TSVN).
9 1 kju
It is a GUI tool that allows you easy execution of all important 
10 1 kju
standard workflow commands via good explorer integration.
11 1 kju
12 1 kju
Git has a not yet such excellent tools.
13 1 kju
However "TortoiseGit":http://code.google.com/p/tortoisegit/ (TGit) is in heavy and rapid development.
14 1 kju
Git GUI, part of the standard windows git package, and especially 
15 1 kju
the all-in-one package gitExtensions are work well.
16 1 kju
17 4 kju
h2. Git
18 1 kju
19 4 kju
h3. Pros of git
20 1 kju
21 4 kju
h3. Cons of git
22 1 kju
23 5 kju
h3. Recommended videos
24 4 kju
25 9 kju
* "GitCasts: Git on Windows":http://www.bestechvideos.com/2008/06/11/gitcasts-git-on-windows. 13 minute screencast.
26 9 kju
  Nice straight forward introduction to git; installing git on windows, using git GUI. Needs basic understanding of VCS.
27 2 kju
* "Distributed Version Control with Git":http://www.vimeo.com/4141466 50 minutes screencast.
28 2 kju
  Explains VBS in general, pros of distributed ones and 
29 2 kju
* "Git Overview Demo (commits, branches, merging, apps)":http://www.vimeo.com/4219277 30 minutes screencast. Quite nice video
30 2 kju
  explaining in detail and easy to understand how to do
31 2 kju
  the basic operations on command line. Great way to get
32 2 kju
  into the basic workflow and possibilities of VCS.
33 2 kju
  Also show *git GUI* briefly.
34 2 kju
* "git-gui screencast":http://www.vimeo.com/2111264 6 minute screencast. 
35 2 kju
  *Explains basic workflow of git GUI* and *shows how to*
36 2 kju
  *stage and commit single line(s)*.
37 2 kju
  This allows small, atomic commits easily! No longer worry
38 2 kju
  about changing several aspects at the same time.
39 1 kju
  *You can sort the commits later on smoothly with this*.
40 1 kju
* GitExtension videos tutorials:
41 1 kju
** "1 Clone - Git Extensions":http://www.youtube.com/watch?v=TlZXSkJGKF8
42 1 kju
** "2 Commit changes":http://www.youtube.com/watch?v=B8uvje6X7lo
43 1 kju
** "3 Push changes":http://www.youtube.com/watch?v=JByfXdbVAiE
44 1 kju
** "4 Pull changes":http://www.youtube.com/watch?v=9g8gXPsi5Ko
45 1 kju
** "5 Handle merge conflicts":http://www.youtube.com/watch?v=Kmc39RvuGM8
46 1 kju
* "Hasan on GIT":http://www.vimeo.com/2881930: 20 minutes recording of git presentation.
47 1 kju
  Fair job and bit more interactive and fun due the present audience.
48 11 kju
* "GitCasts: Git Diff":http://www.bestechvideos.com/2008/07/12/gitcasts-git-diff: 9 minute screencast. Command line used.
49 10 kju
  This episode goes over some of the common or interesting options to 'git diff',
50 10 kju
  showing how to see what has changed between your last commit and your staged files,
51 10 kju
  unstaged files, all changed files or another commit.
52 10 kju
  We also demonstrate how to create and apply patchfiles and
53 10 kju
  how to view changed file stats using diff.
54 10 kju
55 1 kju
56 4 kju
h3. Links
57 1 kju
58 4 kju
h2. Subversion (SVN)
59 1 kju
60 4 kju
h3. Pros
61 4 kju
62 4 kju
h3. Cons
63 1 kju
64 5 kju
h3. Recommended videos
65 5 kju
66 7 kju
* "Basic SVN":http://www.vimeo.com/2260989: 13 minutes screencast. Basic intro to Tortoise SVN,
67 7 kju
  and some of the basic function that should be used when working on a project.
68 6 kju
* "Tutorial: using tortoisesvn, subversion on windows":http://www.vimeo.com/1155196: 20 minute screencast.
69 1 kju
  Nice introductory tutorial on subversion using tortoisesvn covering creating
70 9 kju
  a repository, checking in, merging and some basic version control issues.
71 9 kju
* "Learning how to resolve conflicts within Subversion (SVN) using TortoiseSVN":http://www.bestechvideos.com/2008/08/11/dimecasts-net-34-learning-how-to-resolve-conflicts-within-subversion-svn-using-tortoisesvn
72 9 kju
  6 minute screencast. Nice short video explaining conflicts and how to resolve them with TSVN.
73 8 kju
* "Apache and TortoiseSVN":http://www.vimeo.com/2182829. 20 minutes screencast.
74 8 kju
  In case you want to setup your own SVN repository on a server with apache.
75 4 kju
76 4 kju
h3. Links
77 4 kju
78 4 kju
* "TSVN @ wikipedia":http://en.wikipedia.org/wiki/TortoiseSVN: Short and good feature summary.
79 4 kju
* "TSVN home site":http://tortoisesvn.tigris.org/: Features of TSVN section contains many links to
80 4 kju
  pictures to give you an good idea of the tool and its look.