Git Assessment Re-submit

Hi,

I just failed the git assessment (3/4) and this is my second fail for the technical assessments. I am wondering before I try the challenge again what the usual method for fixing mistakes is. Basically, can I just go in and delete/add the lines of code/ files that it says I am missing or do I need to do the whole assessment from the beginning. Below is the git diff I received. I am honestly a bit worried about this fail because I don’t feel like I have a strong solution to the problem and I have not been getting much advice from my admissions specialist. I am also not sure what the +=======, +<<<<<<< and +>>>>>>> are telling me. Thanks in advance.

Gabe

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

UPDATE:

I understand that the +<<<<<<< etc. are due to a merge conflict. However, I am sure that I changed the lines of code to match the assessment example and then did “accept both changes”. This resulted in my code looking exactly like what was in the example. I also added and committed the files after doing this (99% sure). The only thing I can think of is that maybe it has to do with me not saving the html file before switching branches back to the master? However, I am not sure about that because I would think git would automatically commit changes regardless of whether or not the file is saved.

I’m hoping this is a simple fix. The only other possible explanation is that the way I accepted the merge was wrong? But I double checked it so unless there are specific guidelines I wouldn’t think that would be the case.

Thanks,

Gabe

This looks like what happened. Git will not save changes for you. If you edit a file you must remember to Save.