Git Assessment- Roulin Photo out of order?

Hello, I just failed my assessment 2/4. You can see what I missed below. I think the issue was the placement of the Roulin photo and it was my concern before I submitted, but I don’t see how they get moved around. The assessment asks for the Roulin photo to be 3rd initially and then later on it is supposed to be first. Can some one help me find what I am missing? Thank you!

Screen Shot 2020-09-24 at 2.15.01 PM Screen Shot 2020-09-24 at 2.15.22 PM

The questions you missed were:

’master’ branch

--- a/site.html+++ b/site.html@@ -8,8 +8,8 @@-  <img src="images/drawings/joseph-roulin.jpg">+  <img src="images/drawings/joseph-roulin.jpg">

’together’ branch

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


### Learning Challenge

### Question

### What I've tried

### Screenshots

Hi Ryan, you’re right - the diff is indicating that your images are out of order. Look at the assessment prompt really carefully. You want to make sure that your code / order of images matches the screenshots every step of the way. You may find that you need to move an image to make it match what you see in the assessment directions.

I recommend going back and checking the directions carefully step-by-step.

Hi Jesse,
Thank you for taking the time to help me! Okay glad to know I was on the right track. I’m going through with a fine-tooothed comb and am a little anxious to fail again. I believe the section I need to rethink is:

Check out the “master” branch. Create a new branch named “together”. Check out the “together” branch. Merge the “drawings” branch to the “together” branch. Merge the “pictures” branch to the “together” branch. Fix any merge conflict by making sure the img tags are in the order as seen below in the screenshot.

When I have a merge conflict there are 2 options, but neither have the roulin on top. Would it make sense to manually edit the document to put the roulin in the correct order?

Just wanted to post an update- I passed my module! Thank you again Jesse and for those looking for more direction, look here: GIt assessment 3/4 or here: Help with GIT Diff Assessment Feedback.

2 Likes

I guess I didn’t get here in time! Yes, your conclusion was obviously correct. Nice job problem-solving, and congratulations on the success!