Git Assessment Trouble with Together Branch

[ChrisR]

Hi everyone,

I think I understand 95% of what to do in the Git Assessment, but am looking for some insight to feel more confident submitting my work. I have uploaded the entire Ubuntu history of this assessment. The confusion I have is with the final merging of the together branch with the master branch after lands-end.jpg is deleted. As you can tell from my commands I had to delete it twice since after the master branch was merged with together it reappeared in the drawings directory. Also, I noticed after merging together with master that the together branch still had a merge prompt despite me resolving the previous merges correctly from the drawings and pictures branches. A previous submission of this assessment gave me the following errors:

— a/site.html
+++ b/site.html@@ -8,8 +8,8 @@

**'together' branch**

— a/site.html
+++ b/site.html@@ -8,10 +8,13 @@

+<<<<<<< HEAD+
+=======
+>>>>>>> pictures

This leads me to believe that I should re-commit the together branch after accepting the merging changes prompted by VSCode. However, I am uncertain in doing so as it was not stated in the otherwise step by step instructions.

Thank you for your help!

[ChrisR]

Ok, I accepted both changes in the together branch and re-committed the file and got hit with another error message:

‘together’ branch

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

Anyone know how I can fix this? I do not see an obvious solution as the two lines appear identical.

[jbyers]

Hi Chris,
I see that you figured it out, and just in time!
Congratulations on all of your hard work.
Enjoy the course!
Jesse