App Academy

Question regarding Git Module result

Hello,

I’ve recently received feed-back from my latest Git module submission (see below)

The feedback is a bit difficult to understand but I seem have to a hunch at what it’s implying. I believe I might’ve submitted the .zip incorrectly. As per the instructions, the directory was to be zipped and instead I had zipped the content of the directory (silly me). This must’ve threw off the auto-grader!

Am I correct in my assumption and there are no other errors beside that? If so, may this submission be granted a pass and not compromise an attempt of mine?

TYIA

’drawings’ branch

fatal: ambiguous argument 'student/drawings': unknown revision or path not in the working tree.Use '--' to separate paths from revisions, like this:'git <command> [<revision>...] -- [<file>...]'

’master’ branch

fatal: ambiguous argument 'student/master': unknown revision or path not in the working tree.Use '--' to separate paths from revisions, like this:'git <command> [<revision>...] -- [<file>...]'

’pictures’ branch

fatal: ambiguous argument 'student/pictures': unknown revision or path not in the working tree.Use '--' to separate paths from revisions, like this:'git <command> [<revision>...] -- [<file>...]'

’together’ branch

fatal: ambiguous argument 'student/together': unknown revision or path not in the working tree.Use '--' to separate paths from revisions, like this:'git <command> [<revision>...] -- [<file>...]'
```</strong>

Good morning!

You are exactly right that the auto-grader was not able to run your project due to the zipping. Make sure you zip the the git-repo-management directory, not just the contents inside of it.

I was able to run your files manually, and here is the diff that came out. You only need to correct changes in one branch (the together branch). Once you resolve that merge conflict, you can carefully zip the file before you re-submit.

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

Jesse

Thanks, Jesse for your reply. I found the merge conflict; only in the ‘together’ branch which is a bit odd. I’ll re-submit today :slight_smile:

1 Like