Help with GIT Diff Assessment Feedback

I checked out the example of how to read the Git Diff and I have a loose grasp of it. However, realizing how specific things need to be, I don’t want to waste another attempt so I would like some help in deciphering my git-diff.

The questions you missed were: ‘drawings’ branch

diff --git a/.gitignore b/.gitignore
index e43b0f9…63123fb 100644
— a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.DS_Store
+.DS_store

‘master’ branch

diff --git a/.gitignore b/.gitignore
index e43b0f9…63123fb 100644
— a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.DS_Store
+.DS_store
diff --git a/site.html b/site.html
index 22f95d5…b029da7 100644
— a/site.html
+++ b/site.html
@@ -8,9 +8,13 @@

# Drawing and Pictures

-  +<<<<<<< HEAD +   +  +=======   +>>>>>>> pictures

‘pictures’ branch

diff --git a/.gitignore b/.gitignore
index e43b0f9…63123fb 100644
— a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.DS_Store
+.DS_store

‘together’ branch

diff --git a/.gitignore b/.gitignore
index e43b0f9…63123fb 100644
— a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-.DS_Store
+.DS_store
diff --git a/site.html b/site.html
index 8dccd85…b029da7 100644
— a/site.html
+++ b/site.html
@@ -8,10 +8,13 @@

# Drawing and Pictures

-  +<<<<<<< HEAD   +  +=======   +>>>>>>> pictures

One of the errors is super minor.

It appears that in your .gitignore file … you typed in .DS_store instead of .DS_Store (notice the uppercase ‘S’ on ‘Store’). This appears to be a problem on all your branches (master, drawings, together, and pictures). So be sure to go through all your branches and adjust the .gitignore file and then recommit. Or, just start fresh.

The other two issues appear to simply be having the order of the images in your HTML correct.

For example, on the master branch, your images look like this:

<img src="images/drawings/stag-beetle.jpg">
<img src="images/drawings/joseph-roulin.jpg">
<img src="images/pictures/pearblossom-hwy.jpg">
<img src="images/pictures/specimens.jpg">

when they should look like this:

<img src="images/drawings/joseph-roulin.jpg">
<img src="images/drawings/stag-beetle.jpg">
<img src="images/pictures/pearblossom-hwy.jpg">
<img src="images/pictures/specimens.jpg">

That is what this diff is telling you, in super awesome computer terms, in your feedback:

--- 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

Then on your together branch … you have this as your HTML

<img src="images/drawings/stag-beetle.jpg">
<img src="images/drawings/joseph-roulin.jpg">
<img src="images/pictures/pearblossom-hwy.jpg">
<img src="images/pictures/specimens.jpg">

However, what is supposed to be there is.

<img src="images/drawings/joseph-roulin.jpg">
<img src="images/drawings/lands-end.jpg">
<img src="images/drawings/stag-beetle.jpg">
<img src="images/pictures/pearblossom-hwy.jpg">
<img src="images/pictures/specimens.jpg">

It looks like you’re just missing the “lands-end.jpg” image and the ordering is a bit off.

I hope that helps guide you in the right direction, man! Let us know if you have any more questions.

1 Like

Thank you! This has helped tremendously. Considering how much things have to align, is it safe to assume that, after merging my drawings branch and paintings branch to the master, the following would be marked as incorrect?


(the left is what the asssesment says it should be, the right is what was outputted for me)

If so, how do I go about controlling the order of the outcome? Is doing it manually okay or does it have to be output in order after merging?

Definitely! After the merge happens, you can go in and adjust the HTML elements to be in the correct order. Then add the file(s) to git and commit them.

1 Like

Hi! Sorry to creep, but I’m super confused here. My understanding is that the assessment instructions say to remove lands-end.jpg from the file system and then also from the site.html. Wouldn’t it make sense for the final submit not to include the lands-end.jpg?

I removed lands-end by deleting the file using Terminal and then manually deleted the image tag from the site.html. Should I have used a different strategy to remove the lands-end.jpg?

Thanks for reading!

1 Like

I’d like the answer to this too.

That is 100% correct. There is a lot of context missing from these posts and that is intentionally. We do our best not to give the answer away, but rather just guide people in the right direction. It’s a difficult line to walk.

In your master branch … you did not resolve your conflicts in your site.html file. You will need to go into your master branch and resolve the conflicts (removing lands-end.jpg) and ensuring that the HTML looks like the assessment describes.