The questions you missed were: 'together' branch

[benbolthouse]

Hi all,

Maybe you can help me with this one! I followed the git assessment instructions to a tee. Maybe a little too closely, I’m afraid.

Instructions indicate that in branch drawings the order of images in site.html is as follows:

Note: joseph-roulin.jpg is at the bottom of the body, following stag-beetle.jpg

Now fast forward to branch together. The instructions say to order the images according to the screenshot during the merge from the pictures branch:

joseph-roulin.jpg is shown above stag-beetle.jpg in the body. This was not the case for me when merging in the pictures branch. I was required to manually reorder the <img /> tags to make joseph-roulin.jpg the first image in the body. I believe this is why I got the following assessment result; note the subtraction and addition of the <img /> tag:

I can imagine two possible causes: 1. I did not do the merge conflict correctly (woops!), or 2. the instructions on the assessment are misleading.

To handle the merge conflict, in VS Code I selected the option “Accept Both Changes” and resolved using git add .
I did, however, move the joseph-roulin.jpg <img /> tag during the git merge using VS Code. Maybe that was a bad move? (excuse pun)

Any guidance would be greatly helpful. I really need some input before retaking the git assessment.

Thank you in advance!

[rmaloney]

Hi Ben,

I am right there with you struggling with this, but I chose to not manually add roulin to the top during the conflict resolution and kept the images “out of order” so stag-beetle was first and roulin second. Unfortunately, I also got a fail with this. You can see my diff:

I’m still not sure what the correct answer is. If you figure it out let me know!

Best,
Ryan

[benbolthouse]

Hi Ryan,

I just completed the Git assessment and passed. I cannot share answers with you, but I will say be very careful to do what the assessments ask you to do. I have now completed all of the assessments, and I can say with certainty that there are no accidents, inconsistencies or assumptions about any of the challenges. Double check and triple check your work, and make no assumptions. Period.

You are very close! Follow the directions very carefully. I hope we get a chance to work and study together in the near future

Best of luck!