Well then I REALLY don't get it.  I can branch and merge all day in my scm if there aren't any conflicts.  Is all the hype over git just because maybe the branch and merge commands are slightly simpler?