* 1. Please enter your dev ID below

* 2. Were you aware of the status of your teammate (e.g. what was he/she working on at any particular moment)? Was awareness of the status of your teammate helpful for your task?

* 3. Did you anticipate any conflicts (i.e. you and your teammate modify the same file at same time)?

* 4. When did you become aware of the conflicts? (Pick the answer applying to most tasks)

* 5. When you noticed that your teammate was also modifying the same file, what did you do? (Pick the answer applying to most tasks)

* 6. How many tasks did you have to resolve the merge conflict before you checked in your changes?

* 7. How helpful do you think this exercise is for you to experience different types of conflicts?

* 8. If you could redo these tasks, is there anything that you would do differently this time?

T