gistfile1.txt

1. I didn't have the .gitignore file in place before my first commit
2. git add . && git commit -a -m "first commit"
3. git rm -f db/development.sqlite3
4. git rm -f log/development.log
5. rails error message
6. git revert <last known good rev>
7. fatal: Dirty index: cannot revert
8. git add -f db/development.sqlite3
9. git add -f log/development.log  (command failed)
10. error: Untracked working tree file 'log/development.log' would be overwritten by merge.
fatal: merging of trees 59143a5af23a931e3ddb326b69cbae00011f7d43 and b2c07d79da0253542462f89bdd53035701a63e78 failed
Automatic revert failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.