Git Assessment merge

So Im on my second attempt with the git assessment, this merge is really getting the best of me. Here is my feedback for the first.


and this is what is throwing me off, even thought I opened html with code and changed it around it still telling me to fix conflicts for merge.

any help would be appreciated. thanks!

Hi!

It looks like are moving in the right direction. You will need to resolve the merge conflict first, and then move around the images in the HTML file if they do not match what you see in the directions screenshot. You can resolve it by clicking on “Accept Incoming Change” (or any of the other options), than manually rearrange if needed. Make sure it takes out the <<<HEAD , ======, and >>>>>> lines of code…and if not, you can delete those manually as you fix it.

Jesse

1 Like