Changes between Version 69 and Version 70 of squeak_screencasts


Ignore:
Timestamp:
04/20/2015 09:30:40 PM (9 years ago)
Author:
fabio.niephaus
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • squeak_screencasts

    v69 v70  
    383383
    384384If 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:
    385 
    386 '''Preview'''
    387 
    388 [[Image(GitFileTree-MergeDriver.jpg, 300)]]
    389385
    390386'''Video'''