Closed chcholman closed 11 years ago
Your second commit contains a ton of changed files... are they files that are also in master?
If so, you should run git rebase master
so Github knows those files don't belong in this pull request. Rebasing basically pulls off everything you did in this branch since you split from master, adds everything you've done in master since, and then replaces everything you've done. I'll explain why that's useful at some point.
If these changes are not in master, it might be worth creating another branch for our discussion, so you can feel free to make changes in the first branch that aren't related to this particular issue.
I'm telling you this for future reference, pull requests should only contain relevant code if at all possible. Feel free to tell me to screw off and I'll stop :)
Thanks.
When submitting the grading form with a badge marked as complete, I get an error "WARNING: Can't mass-assign protected attributes: :badge_id => badge.id"