Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add instructions that add collaborator content & generate the merge conflict #6

Closed
lindsayplatt opened this issue May 22, 2024 · 0 comments · Fixed by #12
Closed

Add instructions that add collaborator content & generate the merge conflict #6

lindsayplatt opened this issue May 22, 2024 · 0 comments · Fixed by #12
Assignees

Comments

@lindsayplatt
Copy link
Collaborator

lindsayplatt commented May 22, 2024

Make sure this appears in a user guide, too.

  • The end of Step 9 Closing the loop should say the following: "Before you go on to the next section, your instructor will need to take an action. Ping them to get them to do it, and wait until after they have confirmed things are ready before you move on to the next section.". This is because the static version doesn't have a bot that will automatically simulate a collaborators action. The course contact must do it. For the guide, we need to create additional human-readable instructions for doing this GH action.
  • The beginning of Step 11 Add two new sections of the story is where we have the merge conflict inserted. You should add "Ping your instructor and let them know that you have arrived at this step. There is something that they need to do." to the top of the list. This is where the contact needs to initiate the merge conflict by recreating this GH action. This should go in a course contact guide somewhere. I believe it is just deleting the hyperlink for the word "reservoir"
@lindsayplatt lindsayplatt changed the title Add instructions that generate the merge conflict Add instructions that add collaborator content & generate the merge conflict May 22, 2024
@lindsayplatt lindsayplatt self-assigned this May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant