GIT diff Help, don't know how to fix this issue

Help / Questions Learning Challenge Questions
#1

Learning Challenge

GIT

Question

Got this in my GIT diff results, i cant figure out what i can do to fix it

What I’ve tried

Screenshots

+
- <img src="images/drawings/joseph-roulin.jpg">   
+ <img src="images/drawings/joseph-roulin.jpg">
#2

Hi, @JorgeA95! A couple things …

  1. All your branches are missing the .DS_Store file inside your .gitignore file. This is one of the very first things you do in the assessment.
  2. In your master and together branch, it looks like you resolved the conflicts correctly, but you did not place the img elements in order that the assessment requests.

Hope that helps you out! Best of luck in your next attempt! :four_leaf_clover:

#3

for the .DS_Store in the .gitignore do I just have to save the the file and add and commit to each branch?

#4

That’s correct.

Let us know if you need anything else.

#5

Hi Bryan,

Just a quick question, it looks like i didn’t pass my git assessment again, and the diff is pictured below, i’m not sure what it means. I fixed all the issue from first submission I did but now running into this

Screenshot_20200923-151349_Gmail.jpg
Screenshot_20200923-151349_Gmail.jpg1080×2400 259 KB

#6

Hey, @JorgeA95! This looks like you committed the hidden .vscode folder into your git repository. Unfortunately, this makes our grading system super angry. :angry:

This post should help you out …