Git Assessment Help - I am lost

I’m struggling with this assessment. I felt like I followed the instructions line by line, to the letter, but this was my result:

Any guidance would be very much appreciated, since I’ve used up three failures on this already.

The questions you missed were:

’together’ branch

--- a/site.html+++ b/site.html@@ -6,12 +7,17 @@+-  <img src="images/drawings/joseph-roulin.jpg">+<<<<<<< HEAD+  <img src="images/drawings/joseph-roulin.jpg">+=======+>>>>>>> pictures+

Hey Will,

Looks like you had some minor formatting issues in your together branch. Remember that a “+” in your git diff means “Hey, something is here that shouldn’t be” while a “-” means “Wait a second, something’s missing here that should be here.”

Hope this helps a bit.

Admissions @ a/A


Just adding in a little more detail in to @Staff-Katherine’s response.

Above is a screenshot of your together branch. This is the part in your assessment where it asks you to go in and resolve any “conflicts” in the site.html file.

You’ll simply need to resolve those conflicts by making the HTML look like the assessment describes. Then you’ll commit those changes to the together branch.

Hope that helps! You’re on the right track! :+1:

1 Like

Thanks for the replies guys, I really appreciate it!

I guess I didn’t understand well enough and I’ve failed out. Thanks for the opportunity guys.