Final Exam: Git Ready for the Summer

Please download the answer template file here and rename it to <your_andrewid>.txt. Submit a zip folder containing the file and your repository from Q2 to the "Final" assignment on Autolab. Your submission should look like this:

andrewid.zip/
  andrewid.txt
  98-174-final-q2

List the git commands necessary to create the history graph shown below. You can omit git add and the actual editing of files, but should list any other commands you use (should be git commit, git branch, git checkout, and git merge). (Hint: the first command should be git commit -m "A").
Clone the repository at https://github.com/aperley/98-174-final-q2 and complete the following steps. Do not forget to answer the questions as well.
1. Merge the my-bugfix branch into the master branch. What is this type of merge called?
2. Merge the my-feature branch into the master branch. Why does this cause a merge conflict? Resolve the merge conflicts so file.txt looks like this:
```
This is file.txt.
This line was added in the master branch after my-feature was created.
This line is added in the my-feature branch.
```
3. Include the completely merged 98-174-final-q2 repository in your submission to Autolab.
Fork the "blessed" repository at https://github.com/ilanbiala/98-174-final-q3 and rebase to squash the commits as you see fit. Then create a Pull Request to the "blessed" repository with your changes in a branch named <your_andrewid>. This is all you will submit for question 3, so make sure that the Pull Request went through so we have your "answer" to this question.
BONUS (optional): Download this repository. Someone made a commit adding a secret password to file.txt but that commit got lost. Find the secret password and tell it to Aaron or Ilan on your way out for a bonus point!