Git Assignment issue

Help / Questions Learning Challenge Questions
#1

Git learning challenge

So I just submitted my third attempt at the git challenge and I frankly have no idea where I went wrong and cannot figure out what the diff is trying to tell me. I was super confident going in but now I’m very much thinking I’m missing some key piece in this that I just am not getting

This is the diff I received, and based on what it says my code has the correct number of lines, but the joseph-roulin.jpg file is wrong, but nothing in the instructions say to do anything with it but move it accordingly, and i double checked myself in the file directory before submitting

The questions you missed were:

’master’ branch

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

’together’ branch

--- a/site.html+++ b/site.html@@ -8,9 +8,9 @@-  <img src="images/drawings/joseph-roulin.jpg">+  <img src="images/drawings/joseph-roulin.jpg">
```</strong>
#2

Hi Christina,
I just pulled up your most recent submission (it looks like you submitted again after posting the question).

In the latest submission, I can see that you have an unresolved merge conflict in the together branch. To fix this, you can checkout to that branch, and you will see the conflict in the file. You should be able to see options such as “accept incoming change” - if you accept the incoming change, and double check for typos, you should have the code you need. If not, you can also manually make any changes you need to the branch at this point.

After you are done, make sure you stage and commit the changes to the together branch.

Let us know if anything else comes up!
Jesse