GIT Assessment need help

I got a 3/4 for my assessment and I was missing the following:
The questions you missed were:

’together’ branch

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

I went in and deleted the arrows and HEAD along with the arrows and pictures phrasing and i reformatted it to only included a list of the images as the example showed. I saved the changes and committed them to the together branch. Is there anything else I need to do? Any help will be greatly appreciated!

### Learning Challenge

### Question

### What I've tried

### Screenshots

Good morning!
It sounds like you encountered a merge conflict in your first submission, and submitted without resolving it first.

From your description, you took the right approach in deleting the extra characters, getting the images to match the directions in the prompt, and saving and committing to the correct branch.

I would take one more look to make sure everything looks right across all of your branches, and then re-submit.

Nice job interpreting the diff and figuring out a solution.

1 Like