Git assessment - once more unto the breach

Alright, taking another crack at this. I seem to be missing something during the final merge of the master and together branches.

So, I’ve gone the entire way through the project again to that point. Here is what site.html looks like in my together branch:
togethercommit

And here’s the master version:

mastcommit

As far as I can tell, I’ve done everything exactly the same as last time. Before I submit this again, can you guys tell me where I’m going wrong?

The last time I got this far, after removing lands-end.jpg from the file structure and it’s corresponding line from the HTML I received the following feedback:

The questions you missed were:

’together’ branch

--- a/site.html+++ b/site.html@@ -8,10 +8,13 @@-  <img src="images/drawings/joseph-roulin.jpg">+<<<<<<< HEAD+  <img src="images/drawings/joseph-roulin.jpg">+=======+>>>>>>> pictures
```</strong>

Hey, @Will_Wilson!

If memory serves, I believe you’re supposed to have 5 images in the together branch and 4 in the master branch?

This is the screen shot description for the together branch.

1 Like

Ok, trying this again. So here is my master site.html AFTER merging together with master.

And here is site.html after the merge when I git checkout togther:

togetheradterfinalmerge

Can anyone confirm that this is correct?

At a glance, it looks right. :+1:

Make sure your “together” branch in git doesn’t have this typo though?

1 Like

Fortunately that typo is limited to my post! Fingers crossed, I’m gonna give this one last try.

1 Like

Thanks so much for your help, I passed it!

1 Like