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:
+++ b/site.html@@ -8,8 +8,8 @@
+++ b/site.html@@ -8,10 +8,13 @@
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!