mikeizbicki/ucr-cs100 — pull request #510 by jesuscreyes (2014-12-03 22:49:17+00:00)
Title: Updated README.md for hw2

Hi @mikeizbicki.

Sorry if this pull request is still unacceptable, but I was wondering if you could help me as I'm still trying to do a successful pull request.

When I try to merge all 3 of my commits into one, I get this error:

`error: Commit 739498b is a merge but no -m option was given.`
`fatal: cherry-pick failed`
`Could not apply 739498b`

First question: Do you know how I can fix this error? Or what I can try to do? I tried googling the error, but didn't find anything helpful.

Second question: Is it bad/unacceptable that I have other people's old commits on my repo when I try to do a pull request?