Git Assessment Last Shot to Get it Right :-(

I failed on this. It looks like Together didn’t get merged last night with Master although I’m sure I checked git status on all branches before submit but this morning when I opened the file I saw the unresolved merge conflicts. I can’t check before submitting this and have no more chances on git. My file structures on the two branches I failed -master and together look like what they ask of me now based on what I see. I’ve double and triple checked this time for git status working tree clean. I’ve got no notification of any unsaved file in VS Code. I don’t understand the diff here however and this worries me: How can I have added an extra line and left off the same line on joseph roulin? This from the master branch fail. I had to manually copy and paste the roulin line as it was out of order from the screenshot. Does this mean I didn’t do it right and have to start all over? That file was out of order in the list of imgs even after I resolved the merge conflict and so I copied and pasted it into the right location. Below the roulin error

    'master' branch

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


    '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

(upload://xckDkXzYNFGxwuszCJUrJK3PTR4.png)

Hi, @natoh! Welcome to the community. You’re really close.

I pulled down your submission and here’s what I noticed …

On your master branch it appears that you didn’t resolve your conflicts. Here is what I see in your submission …

<body>
  <h1>Drawing and Pictures</h1>
<<<<<<< HEAD
  <img src="images/drawings/lands-end.jpg">
  <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">
>>>>>>> pictures
</body>

Those <<<<, >>>>, ==== symbols are showing you the “git conflicts.” I think if you simply go back in to your master branch and make your img tags look exactly like the assessment describes. You should be good. :+1:

And also on your together branch, it looks like you’ve left the conflicts in there as well.

I think if you just go in to your master and together branch, make the HTML look like the assessment describes, add and commit those changes in to each git branch … you should be good to go!

I hope that helps, @natoh! Please let us know if you have any other questions.

1 Like

Hi Bryan,

That diff i posted was from my first and only submission on this module but the screenshots are my updated work. I went through the diff I received by email and made updates to master and together. Sorry my initial post was so long winded, maybe you didn’t notice the screenshots of the latest version? Also I had a question about my feedback from the fail: How can I have added an extra line and left off the same line on joseph roulin?

Oh, I see. That makes sense. Sadly, I won’t be able to tell you if your updates are “correct” or not, but they do appear to have the conflicts removed, so definitely on the right track!

I’m not entirely sure I understand the question, but let me take a stab.

It’s not particularly complaining about “you left off the same line” … it’s just saying that “this area of code does not look like the line of code that it is supposed to look like.” It’s ultimately saying … "Hey, super cool developer friend … this line here:

<<<<<<< HEAD
<img src="images/drawings/lands-end.jpg">
<img src="images/drawings/joseph-roulin.jpg">
=======
>>>>>>> pictures

does not look like this line here:

<img src="images/drawings/joseph-roulin.jpg">

It’s just telling you that in a “computer’ish” way.
ps. Computers always talk to me like that in my head. :wink:

Does that help you answer your question at all? Or just add more confusion.

Hooray! I passed :slight_smile: :smile:

3 Likes