Your commits do not look like the commits from the previous video. A git merge does
In the previous video you merged the testing branching indirectly into the master branch because you created a branch that branched off of the test branch and then merged that branch into the master branch. This video skips those steps from the previous video. I now assume those steps were a mistake. I figured. But now I don't know what to do or how to get back on track. The problem right now is that when I do a git merge on the testing branch. (git merge master) I am not asked to create a commit. I just get a fast forward.
Jay McGavrenTreehouse Teacher
okilydokily Thanks for your suggestion regarding project files. All videos in the course should now have a "project files" link under the Downloads tab at the bottom of their page. If you click that, it will download a .zip file containing one or more Git repositories that represent the state of the project at the start of that video, allowing you to follow along.
I went through the remainder of the course again, and the discrepancy you pointed out was the only one I could find. You should be able to follow along for the rest of the course using your existing repo without further issues. But if you do encounter trouble, just download the project files attached to that video, and you'll be ready to go.
I have also recorded updated footage for the video that contained the discrepancy. Our video and audio teams will need a few days to process it, but we hope to have an update made soon. Thanks for letting us know!