Git/Diff Confirmation

I’m getting a bit better at reading the GIT Diff. Due to the limited number of tries, I would like to get some confirmation on what I’m doing wrong before moving forward:

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

I believe this is from not saving the HTML file after merging master and together? The assessment doesn’t specifically say to save it like it does in the other branches so this makes me uncertain.

’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

I’m not sure about this one at all…is it connected to the first issue?

Hey, @TechTris! Let me see if I can explain this without causing more confusion. Wish me luck!

You should try to make it a habit of always saving your changes.

As a developer, it is almost guaranteed, that at some point you’re going to write a big chunk of amazing code and then your power on your laptop is accidentally going to run out. At which point, you’re going to begin praying to the gods of all that is laptops that the application you were writing in was keeping a backup for you. Once you get bitten by that a few times, and everyone has, you will start to just randomly hitting (CMD/CTRL)+S in every application you use.

master branch

I believe the error in the branch is caused by not resolving your conflict in the together branch. If you resolve the conflict in the together branch and then merge those changes down in to master, and ensure that in the master branch the img elements are ordered just like the assessment describes, you should be good to go.

together Branch

It does appear that maybe you didn’t save? It’s hard to tell. Your together branch still has the actual git conflict code in it (all the < and > arrows everywhere).

Your solution for this should be as simple as going in to your together branch, looking at that portion of the assessment, ensuring that your image tags are exactly like the assessment asks, saving the file, adding the changes to git staging, and committing. :+1:

Hopefully that helps, man! Please let me know if I have only added more confusion.

1 Like