Homework

[nabosido]

Hi Kevin. No idea if this will work but here goes!

[kescobo]

It looks like you added a submodule of this repo to the repo... not sure how you accomplished that, but we don't want it :-).

It looks like it was added in your second commit when you tried to merge. You also didn't merge the latest version of the master branch.

Try this - it will undo your last commit, get the latest version of master to merge in, and (I think) get you to the right place:

$ git checkout nisdev3
$ git reset --hard HEAD~1
$ git checkout master
$ git reset --hard HEAD~2
$ git pull upstream master
$ git checkout nisdev3
$ git merge master -m "Merge with upstream master"
$ git push --force

To re-iterate in plain language:

1. Check out your dev branch
2. Go back one commit (before you added the submodule)
3. Check out your master branch
4. Go back 2 commits (this is where you branched from)
5. Pull the latest master from my repo (assuming you called it upstream when you added it
6. Check out your dev branch again
7. Merge the new commits you just pulled into it
8. Push the commits (the --force flag is required because you're re-writing history - the commit where you added the submodule is being erased).

Give that a shot and let me know how it goes :-)

[kescobo]

The hash here makes this a header, you don't need the * for bold.