1. 7
  1.  

  2. 5

    I feel it would have been more meaningful (again, just my opinion) if there were more constraints to the task. For example, a maximum edit distance (or maximum number of cells that can be changed) between commits (or the merge is rejected) and a restriction on how often an individual can push the code.