App Academy

Git assessment 3 out of 4

Hello! I submitted my git assessment and I am having a bit of trouble figuring out what I got wrong. It looks like it has something to do with joseph-roulin.jpg image. I read up on the Interpreting Diffs page but still a bit confused. Any help would be greatly appreciated. Thanks so much!

Here is my diff:
image

Hi Gizelle. Welcome to the community!

It looks like you ran into a merge conflict when you merged your other branches into the together branch. The arrows and equal signs that you see in the diff show that the merge conflict was unresolved - basically, you didn’t tell VSCode how to deal with the conflict.

If you open your file and check out the together branch, you should be able to see those weird lines in the code. You will also see some options you can click on, such as “accept incoming changes”, “accept both changes”, etc. You can click on those choices OR manually delete the weird lines of code and rearrange the images until they match the picture in the directions for what the together branch should look like.

After that, just save your work, stage and commit those changes, and re-submit.

Jesse

1 Like

I was able to figure it out!! Thanks so much!

1 Like