Changes between Version 61 and Version 62 of squeak_screencasts

Timestamp:

04/23/2014 05:03:48 PM (10 years ago)

Author:

eric.seckler

Comment:

added filetree/git sections

squeak_screencasts

@@ -423 +423 @@
 Open !SwaLint from the Apps menu to perform static code analysis, which check for idiomatic code and gather code metrics. Then select the packages and classes you want to analyze. A reporter presents the results and offers to browse the occurrences of mismatches.
 
+= Versioning and CI with Filetree, GitHub and TravisCI =
+== Filetree and Git: Basics ==
+'''Description'''
+
+We're showing you how to setup your local working copy of a GitHub Squeak Project that is preconfigured for continuous integration with Travis-CI.
+The Project shown is available on GitHub at: https://github.com/SWTI2014/SWTI2014-Project-XX
+
+'''Preview'''
+
+[[Image(FiletreeGit-1.jpg, 300)]] [[Image(FiletreeGit-2.jpg, 300)]]
+
+'''Video'''
+
+[[Video(mp4=attachment:FiletreeGit.m4v,webm=attachment:FiletreeGit.webm,poster=attachment:FiletreeGit-1.jpg,preload=none)]]
+
+== Filetree and Git: Team work ==
+'''Description'''
+
+Continuing were the first "Filetree and Git" video left off, we show you how to fetch and merge changes made by other contributors and how to commit and push your own changes. We'll also show you how to resolve merge conflicts inside the Squeak Image.
+
+'''Preview'''
+
+[[Image(FiletreeGitMerge-1.jpg, 300)]] [[Image(FiletreeGitMerge-2.jpg, 300)]]
+
+'''Video'''
+
+[[Video(mp4=attachment:FiletreeGitMerge.m4v,webm=attachment:FiletreeGitMerge.webm,poster=attachment:FiletreeGitMerge-1.jpg,preload=none)]]
+
+Download mp4 video:[[attachment:Monticello-Introduction.m4v]]
 = Contributors =
  * Eric Seckler