Git Assessment 0/0 Zipping Issue?

I submitted my Git assessment on Saturday and waited to receive the email confirming whether i passed or failed, however the email never came. I contact my advisor and he was able to push it through to see what happened and i received a 0/0. He told me this was most likely a zipping issue and not a coding issue. I followed the zipping instructions step by step (not rocket science) but im just trying to see if anyone can confirm this has happened or what i should do before i try zipping the file and resubmitting as id prefer not take another fail mark over a “zipping issue”.

I received an email finally. It pretty much told me i got everything wrong, which makes 0 sense as i followed the directions point by point.
Email stated:

The questions you missed were:

’drawings’ branch

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

’master’ branch

--- a/.gitignore+++ b/.gitignore@@ -1 +1 @@-.DS_Store+.DS_store

’pictures’ branch

--- a/.gitignore+++ b/.gitignore@@ -1 +1 @@-.DS_Store+.DS_store

’together’ branch

--- a/.gitignore+++ b/.gitignore@@ -1 +1 @@-.DS_Store+.DS_store--- a/site.html+++ b/site.html@@ -8,10 +8,13 @@+<<<<<<< HEAD+=======+>>>>>>> pictures

Could this be a zipping issue? or am i really this bad at git?

I checked out all of the git branches and all are clean, nothing to commit.
Fixed one issue it together, where i had conflicting commits, that has been corrected.
Everything else was followed step by step, im not sure what else would flag all of these issues unless it was an overall submitting issue.

Decided to dig through others issues with this assessment and flush out the issues in the code myself.
One issue was simply a miss naming of the DS_Store
Other issue seems to be a file arrangement issue.