learn-co-curriculum / git-workflow-merge-conflicts-lab Goto Github PK

#5 was not fixed for students doing pre-work for the 8/26 cohort: https://github.com/learn-co-students/git-workflow-merge-conflicts-lab-dumbo-web-82619
#staff

I am unable to progress through the labs because the IDE keeps disconnecting. Can someone please help?

In "From the master branch, run open index.html from your terminal... ", the command "open index.html" give the error "bash: open: command not found". The command httpserver works to open the page in a new tab.

On 7/15/19, the Readme was updated on the master branch but not on the two other branches the student is supposed to merge. This causes the following error: "CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result."

Student fix:
The lab is about resolving merge conflicts. Students will need to read through the rest of the lesson and apply their newfound knowledge to resolve the merge conflict in the Readme before resolving the other merge conflict in the lesson.

Lesson fix: Update the readme on the other two branches.

Thank you.

The README.md file that doc-brown merges is different than the master and creates merge conflicts.

i need help and can't ask a question its not letting me for some reason why???

this lab is not working
this is what it says
There was a problem cloning this lesson. Retrying...
Cloning lesson...
Cloning lesson...
Cannot clone this lesson right now. Please try again.