Git vs SVN comparison

Version 19 (kju, 04/29/2009 07:05)

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 16 kju
  Nice straight forward introduction to git; installing git on windows,
27 16 kju
  using git GUI. Needs basic understanding of VCS.
28 2 kju
* "Distributed Version Control with Git":http://www.vimeo.com/4141466 50 minutes screencast.
29 2 kju
  Explains VBS in general, pros of distributed ones and 
30 2 kju
* "Git Overview Demo (commits, branches, merging, apps)":http://www.vimeo.com/4219277 30 minutes screencast. Quite nice video
31 2 kju
  explaining in detail and easy to understand how to do
32 2 kju
  the basic operations on command line. Great way to get
33 2 kju
  into the basic workflow and possibilities of VCS.
34 2 kju
  Also show *git GUI* briefly.
35 2 kju
* "git-gui screencast":http://www.vimeo.com/2111264 6 minute screencast. 
36 2 kju
  *Explains basic workflow of git GUI* and *shows how to*
37 2 kju
  *stage and commit single line(s)*.
38 2 kju
  This allows small, atomic commits easily! No longer worry
39 2 kju
  about changing several aspects at the same time.
40 1 kju
  *You can sort the commits later on smoothly with this*.
41 1 kju
* GitExtension videos tutorials:
42 1 kju
** "1 Clone - Git Extensions":http://www.youtube.com/watch?v=TlZXSkJGKF8
43 1 kju
** "2 Commit changes":http://www.youtube.com/watch?v=B8uvje6X7lo
44 1 kju
** "3 Push changes":http://www.youtube.com/watch?v=JByfXdbVAiE
45 1 kju
** "4 Pull changes":http://www.youtube.com/watch?v=9g8gXPsi5Ko
46 1 kju
** "5 Handle merge conflicts":http://www.youtube.com/watch?v=Kmc39RvuGM8
47 1 kju
* "Hasan on GIT":http://www.vimeo.com/2881930: 20 minutes recording of git presentation.
48 1 kju
  Fair job and bit more interactive and fun due the present audience.
49 12 kju
50 12 kju
Advanced:
51 12 kju
52 1 kju
* "GitCasts: Git Diff":http://www.bestechvideos.com/2008/07/12/gitcasts-git-diff: 9 minute screencast. Command line used.
53 10 kju
  This episode goes over some of the common or interesting options to 'git diff',
54 16 kju
  showing how to see what has changed between your last commit and
55 16 kju
  your staged files, unstaged files, all changed files or another commit.
56 1 kju
  We also demonstrate how to create and apply patchfiles and
57 10 kju
  how to view changed file stats using diff.
58 13 kju
* "GitCasts: Git Log":http://www.bestechvideos.com/2008/05/29/gitcasts-git-log: 6 minute screencast.
59 13 kju
  This episode is on git-log, which demonstrates most of the major features and
60 13 kju
  options to the git-log command. It includes showing the stat, short-stat and
61 13 kju
  name-stat options, the pretty options, the since and until limiters, the path
62 13 kju
  limiter and author field searching.
63 1 kju
64 1 kju
Expert:
65 1 kju
66 19 kju
* "GitCasts: Branching and Merging":http://www.bestechvideos.com/2008/05/29/gitcasts-branching-and-merging: 9 minute screencast.
67 19 kju
  In this screencast, we take you through a workflow where we branch, stash and
68 19 kju
  merge several times. It demonstrates the branch and show-branch commands,
69 19 kju
  how to switch branches, how to stash changes, how to list and apply stashes,
70 19 kju
  how to resolve conflicts, how to create and delete topic branches,
71 19 kju
  and what fast-forward merges are.
72 19 kju
* "GitCasts: Git Submodules":http://www.bestechvideos.com/2008/06/23/gitcasts-git-submodules: 15 minutes Screencast.
73 19 kju
  Needs submodules concept understanding!
74 19 kju
  Shows use of submodules quite extensively and well presented.
75 14 kju
* "GitCasts: Browsing Git Objects":http://www.bestechvideos.com/2008/05/29/gitcasts-browsing-git-objects: 7 minute screencast.
76 14 kju
  In this episode, I show how to browse and inspect raw Git objects.
77 14 kju
  The major tools covered are the git cat-file and git ls-tree commands to
78 14 kju
  inspect the object contents, and then I cover some of the included graphical
79 14 kju
  browsers, gitk and gitweb.
80 14 kju
81 4 kju
h3. Links
82 1 kju
83 4 kju
h2. Subversion (SVN)
84 1 kju
85 4 kju
h3. Pros
86 4 kju
87 4 kju
h3. Cons
88 1 kju
89 5 kju
h3. Recommended videos
90 5 kju
91 17 kju
* "TortoiseSVN (Subversion) for local use:
92 17 kju
  Short and good for non IT people. Summarizes the basic workflow.
93 17 kju
** "Part 1":http://www.youtube.com/watch?v=-h6cj6O94Gs: 4 minute screencast.
94 17 kju
   Topic: Baisc introduction to VCS and basic install guide for TSVN.
95 17 kju
** "Part 2":http://www.youtube.com/watch?v=4jlvW2_vxQY: 6 minute screencast.
96 17 kju
   Topic: The basic checkout of a repository.
97 17 kju
** "Part 3":http://www.youtube.com/watch?v=fklbVZyZbcc: 6 minute screencast.
98 17 kju
   Topic: Organization, create basic directory structure.
99 17 kju
** "Part 4a":http://www.youtube.com/watch?v=vwV6y0SQNx0: 8 minute screencast.
100 17 kju
   Topic: Checkout and add files.
101 17 kju
** "Part 4b":http://www.youtube.com/watch?v=yEXXIjMLL68: 4 minute screencast.
102 17 kju
   Topic: Checkin or committing files to the repository.
103 17 kju
** "Part 5":http://www.youtube.com/watch?v=Z_A7SFbczVc: 9 minute screencast.
104 17 kju
   Topic: Version of files, commit comments.
105 17 kju
** "Part 6a":http://www.youtube.com/watch?v=o9iU88Oijcw: 6 minute screencast.
106 17 kju
   Topic: Version number for files, SVN log and file history.
107 17 kju
** "Part 6b":http://www.youtube.com/watch?v=CxPFRD_YJpg: 6 minute screencast.
108 17 kju
   Topic: Basic intro to the concept of branching and how to create them in TSVN.
109 17 kju
110 17 kju
* "Installing Subversion":http://www.youtube.com/watch?v=2LU6LDXJm7U: 6 minute screencast.
111 17 kju
  Nice basic install guide and intro to TSVN for non IT people.
112 7 kju
* "Basic SVN":http://www.vimeo.com/2260989: 13 minutes screencast. Basic intro to Tortoise SVN,
113 7 kju
  and some of the basic function that should be used when working on a project.
114 6 kju
* "Tutorial: using tortoisesvn, subversion on windows":http://www.vimeo.com/1155196: 20 minute screencast.
115 1 kju
  Nice introductory tutorial on subversion using tortoisesvn covering creating
116 9 kju
  a repository, checking in, merging and some basic version control issues.
117 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
118 9 kju
  6 minute screencast. Nice short video explaining conflicts and how to resolve them with TSVN.
119 17 kju
* "Tutorial SVN":http://www.youtube.com/watch?v=d1RVEtsLWyE: 3 minute screencast.
120 17 kju
  Explain in French how to setup a repos with TSVN.
121 12 kju
122 12 kju
Advanced:
123 12 kju
124 15 kju
* "Best Practices for Subversion (SVN)":http://www.youtube.com/watch?v=MfLLDg7zWQg: 8 minute screencast.
125 15 kju
  Somewhat confusing as voice and text are not properly linked. Fair idea to listen
126 15 kju
  to voice *only* first and watch it a second time without sound.
127 15 kju
  That said good video sharing some thoughts about standard SVN directory structure
128 15 kju
  and directory design, updating, commit logs and binary file handling in SVN.
129 17 kju
* "Creating a Branch in SVN with TSVN":http://www.youtube.com/watch?v=7j4tvvYSTIg: 3 minute screencast.
130 17 kju
  Short, nicely explained and well done.
131 15 kju
132 15 kju
Expert:
133 15 kju
134 8 kju
* "Apache and TortoiseSVN":http://www.vimeo.com/2182829. 20 minutes screencast.
135 8 kju
  In case you want to setup your own SVN repository on a server with apache.
136 4 kju
137 4 kju
h3. Links
138 4 kju
139 18 kju
Basics:
140 18 kju
141 4 kju
* "TSVN @ wikipedia":http://en.wikipedia.org/wiki/TortoiseSVN: Short and good feature summary.
142 4 kju
* "TSVN home site":http://tortoisesvn.tigris.org/: Features of TSVN section contains many links to
143 4 kju
  pictures to give you an good idea of the tool and its look.
144 18 kju
145 18 kju
Docu:
146 18 kju
147 18 kju
* "svnbook":http://svnbook.red-bean.com/
148 18 kju
149 18 kju
Tools: