Help With Git Assessment? I am not sure where I went wrong

#1

Unfortunately you did not receive a passing score on your latest module, Git Assessment. Your score was 0 / 4.

Remember, you’re allowed to fail a total of 4 attempts between all modules. You have currently used 1 out of 4 attempts. To continue, please retake the module, Git Assessment, in the prepwork.

As a reminder, you’ve completed 1 out of 3 total modules. Once all three modules are complete, you’ll be able to join an upcoming cohort.

The questions you missed were:

’drawings’ branch

diff --git a/site.html b/site.htmlold mode 100644new mode 100755index 4ed045c..35d9238

’master’ branch

diff --git a/site.html b/site.htmlold mode 100644new mode 100755index 22f95d5..cca7acb--- a/site.html+++ b/site.html@@ -8,8 +8,8 @@ </head> <body>   <h1>Drawing and Pictures</h1>-  <img src="images/drawings/joseph-roulin.jpg">   <img src="images/drawings/stag-beetle.jpg">+  <img src="images/drawings/joseph-roulin.jpg">   <img src="images/pictures/pearblossom-hwy.jpg">   <img src="images/pictures/specimens.jpg"> </body>

’pictures’ branch

diff --git a/site.html b/site.htmlold mode 100644new mode 100755index cd6c465..4f75e41

’together’ branch

diff --git a/site.html b/site.htmlold mode 100644new mode 100755index 8dccd85..5d279ca--- a/site.html+++ b/site.html@@ -8,10 +8,13 @@ </head> <body>   <h1>Drawing and Pictures</h1>-  <img src="images/drawings/joseph-roulin.jpg">+<<<<<<< HEAD   <img src="images/drawings/lands-end.jpg">   <img src="images/drawings/stag-beetle.jpg">+  <img src="images/drawings/joseph-roulin.jpg">+=======   <img src="images/pictures/pearblossom-hwy.jpg">   <img src="images/pictures/specimens.jpg">+>>>>>>> pictures </body> </html>\ No newline at end of file
```</strong>
#2

@bryanray Would you help?

#3

Hi, @nmenon! :wave:

I think this one is on our side … let me take a look at a couple things and I’ll follow up. :pray:

1 Like
#4

Hey, @nmenon! Apologies for the delay … it took us a little while to track things down.

We figured it all out now. You may have received a couple emails in our debugging process. Please feel free to ignore those, except the last one. The last email should be showing that you did have a couple minor things wrong with your assessment.

  1. Your master branch had an image in the wrong spot.
  2. Your together branch, you’ll need to go in and resolve the conflicts, Putting in place the correct HTML and image ordering.

Please let me know if you need any further help with your assessment. You’re on the right track! :tada: :confetti_ball: :partying_face: :raised_hands:

#5

Hey There Bryan,

Thank you so much for your help! I do have some additional questions I hope I am not bothering you by asking but

  1. For the couple of emails in the debugging process, it shows I submitted and failed an additional 2 times, so should I just ignore that or would you have to change that in the system?

  2. For the Master branch when you were meaning image in the wrong spot are you meaning this? Like switching the lines of code as shown here.

    Master Branch
    Master Branch1294×694 78.9 KB

  3. And Finally for the together branch, I am curious that if you merged it with the master, how the together branch would have conflicts. On Git Status it did say that the together branch was clean, but when I looked at in visual code it showed the changes.

Screen Shot 2020-07-27 at 11.06.54 AM
Screen Shot 2020-07-27 at 11.06.54 AM2192×1116 232 KB

So I clicked accept both changes, and it became

Screen Shot 2020-07-27 at 11.26.30 AM
Screen Shot 2020-07-27 at 11.26.30 AM1238×696 86.1 KB

But should the together branch look like the earlier example like this?

git-repo-management--merged-branches-on-together
git-repo-management--merged-branches-on-together875×559 26.6 KB

Thank you so much for your help Bryan, I really appreciate it!

Nick

#6

You can just ignore it. Just automated emails that we couldn’t avoid behind the scenes.

Correct. I believe you’ll want to check in the assessment. It should describe exactly how to order those images for you.

Ultimately, what git is telling you is, “Hey, Developer. In one branch you have this and in another branch you have this. I have no way to figure out which one you want, so I need you to “resolve” that for me.”

Again, you should be able to simply go in to the together branch, go to the assessment page, and the assessment should tell you exactly how it should look in the “together” branch.

1 Like
#7

Great, Thank you so much! I just passed :slight_smile:

1 Like