So I’ve tried the assessment a couple more times (haven’t submitted though) and I’m going to revise what I think the solution is:
I may be forgetting to save my site.html doc after I make the changes.
I think I’ve realized that where I am in the DIRECTORY affects which changes are committed to the BRANCH. I had previously assumed that each branch tracked all the changes made to the entire directory (within that branch).
Now when I double check the “together” branch after I complete the project, it looks how it’s supposed to. This is my most recent attempt (unsubmitted):
I’ve been selecting “Accept Both Changes” and then reordering the images to fit the screenshot provided by the instructions.
A different forum post suggested just deleting <<<HEAD, ===, etc manually rather than accepting the changes. Either way, after I reorder the img tags, the result LOOKS the same. I don’t see how that would affect the outcome but I’m going to do that instead. And if it DOES affect the outcome, would someone mind explaining how?