Git Teamwork. Git Merge #5 2nd part.
I have gone through the git --help and through the whole forum all solutions given have not worked in getting past the second part. It would seem a simple git merge origin/master would do, but it doesn't work. I have tried multiple times the last couple days restarted the exercise with no avail. Spelling is good too, but no such luck. Solutions?