7. merge conflict I


#1



https://www.codecademy.com/courses/learn-git/lessons/git-branching/exercises/merge-conflict-1?action=lesson_resume&link_content_target=interstitial_lesson


Well I can't seem to add resume.txt... Again... It asks me to add resume.txt to the staging area, I did it before but I can't seem to do it again.


#2

What's stopping you?


#3

I'm not sure, I just get an error message whenever I try to re-add it, here's my syntax and error messages.

git add resume.txt

Did you add your file changes to the staging area?


#4

After trying the exercise I find that I get the same behaviour as you describe.

Since codecademy suggests that the file hasn't been added, the next logical thing to do is run git status to see which is the case.
For whatever reason that made the checkpoint turn green.. their environment is bit of a flimsy mess.


#5

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.