Here


#1

$ git log
:log:
$ git merge origin/master
merge: origin/master - not something we can merge
$


#2

Hi Jpearson14,

Would you please post a link to the exercise you're on?
Thanks.