Hi Lori,
When I try Git pull upstream master, I get an error saying
*Automatic
merge failed; fix conflicts and then commit results*. When I fix the
conflict and push it I get the same error as in my previous email. I have
attached the full error message when I pull the upstream master b
Have you tried doing a 'git pull upstream master' ? Do you get any messages
when running that command?
Generally try the following and post any error messages:
Git pull upstream master
( resolve any merge conflicts and commit )
( make any additional changes and commit)
Git push upstream master
