Changes between Version 66 and Version 67 of squeak_screencasts

Timestamp:

04/20/2015 09:27:35 PM (9 years ago)

Author:

fabio.niephaus

Comment:

Add GitFileTree-MergeDriver screencast

squeak_screencasts

@@ -378 +378 @@
 Download mp4 video:[[attachment:FiletreeGitMerge.mp4]]
 Download webm video: [[attachment:FiletreeGitMerge.webm]]
+
+== Filetree and Git: Merging two branches with !GitFileTree-!MergeDriver ==
+'''Description'''
+
+If you are working on multiple branches and you want to merge one into another, you can use [[https://github.com/HPI-SWA-Teaching/GitFileTree-MergeDriver|GitFileTree-MergeDriver]]. If you have set it up correctly, this is how it works:
+
+'''Preview'''
+
+[[Image(GitFileTree-MergeDriver.png, 600)]]
+
+'''Video'''
+
+[[Video(mp4=attachment:GitFileTree-MergeDriver.mp4,poster=attachment:GitFileTree-MergeDriver.jpg,preload=none)]]
+
+Download mp4 video:[[attachment:GitFileTree-MergeDriver.mp4]]
 
 = Tests are your safety net =
@@ -462 +477 @@
  * Tim Felgentreff
  * Willi Müller
-
-'''Contact us''': {robin.schreiber, eric.seckler, patrick.rein, willi.mueller}@student.hpi.uni-potsdam.de
+ * Fabio Niephaus
+
+'''Contact us''': {robin.schreiber, patrick.rein, willi.mueller, fabio.niephaus}@student.hpi.uni-potsdam.de
 
 http://squeakbyexample.org/