Timeout

[jdaum]

small changes made to the website

[jayfo]

Instead of pulling master into your feature branch, rebase onto it:

git checkout timeout
git rebase -i master
git push -f

[jdaum]

Are these commits supposed to appear here? I don't think that happened before....

[jayfo]

It looks like your master is behind, causing this issue:

You need to update your master:

git checkout master
git pull uwcse440 master
git push

Then rebase your branch, and resolve any conflicts while you're at it:

git checkout timeout
git rebase -i master
git push -f

That'll update this pull request.

[jayfo]

Hmmm, we might be in strange git land.

[jdaum]

Ok, it looks better now on the network graph. So I hope it worked.

[jayfo]

Looks great now.