Edward and Martin get caught up after the security release earlier thismonth and talk branching and merging, including how Git actuallystores branches and does merging. Part one of two.