Beccadev

[BeccaGilbert]

Something's wrong but I cannot figure out what it is. I'll have Sophie look tomorrow, but I figured it can't hurt to just put the pull request in and see if you see what's wrong.

[kescobo]

@BeccaGilbert It looks like you have a merge conflict on the README.md file from when you added your name, since I also edited it. You've got a pretty old version of the master branch. Assuming you have all of your changes committed on your dev branch, do the following:

$ git checkout master
$ git reset --hard
$ git pull upstream master # assuming here you named my remote "upstream"
$ git checkout beccadev
$ git merge master

You will likely see some stuff about merge conflicts (it's in the README.md file. You can try to fix them with the aid of a GUI like the one in Atom or GitKraken.

If you can't, that's ok, I can fix the conflicts on this end. But give it a shot and see what happens.